Merge branch 'hotfix/require-type'

Author: valeriangalliat

Makefile

@@ -21,7 +21,7 @@ lint: .jshintrc
 	$(BIN)js-yaml $< > $@
 
 test: test/data/expected.stream.json dist
-	$(BIN)_mocha test/**/*.test.js
+	$(BIN)mocha test/**/*.test.js
 	$(SASSDOC) --parse test/data/test.scss | diff - test/data/expected.json
 	$(SASSDOC) --parse - < test/data/test.scss | diff - test/data/expected.stream.json
 	rm -rf sassdoc && $(SASSDOC) test/data/test.scss && [ -d sassdoc ]

package.json

@@ -21,7 +21,7 @@
       "url": "https://twitter.com/pascalduez"
     }
   ],
-  "version": "2.1.5",
+  "version": "2.1.6",
   "license": {
     "type": "MIT",
     "url": "http://opensource.org/licenses/MIT"

src/annotation/annotations/require.js

@@ -120,7 +120,7 @@ export default function (env) {
             return req;
           }
 
-          let reqItem = Array.find(data, x => x.context.name === req.name);
+          let reqItem = Array.find(data, x => x.context.name === req.name && x.context.type === req.type);
 
           if (reqItem === undefined) {
             if (!req.autofill) {

test/annotations/require.test.js

@@ -49,6 +49,18 @@ describe('#require', function () {
 
   it('should work for multiline description', function () {
     assert.deepEqual(requires.parse('name - description\nmore\nthan\none\nline'), { type: 'function', name: 'name', description: 'description\nmore\nthan\none\nline', 'external': false });
-   });
+  });
+
+  it('should resolve by type and name', function () {
+    var data = [
+      { context: { type: 'function', name: 'rem' } },
+      { context: { type: 'mixin', name: 'rem' } },
+      { context: { type: 'mixin', name: 'test' }, require: [ { type: 'mixin', name: 'rem' } ] },
+    ];
+
+    requires.resolve(data);
+
+    assert.deepEqual(data[2].require[0].item.context, { type: 'mixin', name: 'rem' });
+  });
 
 });