Load spec files with the same name in different directories

The importer will cache imports with the same name, so we need to make a
fresh copy of the importer with `imports['.']` each time we load a spec
file, in case it has the same name as a preceding spec file.

Closes: #11

jasmine.json

@@ -1,5 +1,5 @@
 {
-    "exclude": ["test/fixtures", "test/focusedSpecIntegrationTest.js"],
+    "exclude": ["test/fixtures/*", "test/focusedSpecIntegrationTest.js"],
     "spec_files": "test",
     "options": "--verbose"
 }

src/jasmineBoot.js

@@ -67,12 +67,21 @@ var Jasmine = class Jasmine {
 
     loadSpecs() {
         const oldSearchPath = imports.searchPath.slice();  // make a copy
+        let specImporter = imports['.'];
         this.specFiles.forEach(function (file) {
             const modulePath = GLib.path_get_dirname(file);
             const moduleName = GLib.path_get_basename(file).slice(0, -3);  // .js
+
+            // Backwards compatibility - let specs import modules from their own
+            // directories
             imports.searchPath.unshift(modulePath);
-            void imports[moduleName];
+            specImporter.searchPath.unshift(modulePath);
+            void specImporter[moduleName];
             imports.searchPath = oldSearchPath;
+
+            // Make a new copy of the importer in case we need to import another
+            // spec with the same filename, so it is not cached
+            specImporter = specImporter['.'];
         });
     }
 

test/fixtures/path1/test.js

@@ -0,0 +1 @@
+describe('A suite', function () {});

test/fixtures/path2/test.js

@@ -0,0 +1 @@
+throw new Error('Catch this error to ensure this file is loaded');

test/jasmineBootSpec.js

@@ -113,24 +113,42 @@ describe('Jasmine boot', function () {
         expect(testJasmine.specFiles).toEqual([]);
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
         expect(testJasmine.specFiles).toMatchAllFiles([
-            `${SRCDIR}test/fixtures/someSpec.js`,
             `${SRCDIR}test/fixtures/otherSpec.js`,
+            `${SRCDIR}test/fixtures/path1/test.js`,
+            `${SRCDIR}test/fixtures/path2/test.js`,
+            `${SRCDIR}test/fixtures/someSpec.js`,
         ]);
         expect(testJasmine.specFiles.every(path => path.indexOf('notASpec.txt') === -1)).toBe(true);
     });
 
+    it('adds spec files in different directories with the same name', function () {
+        testJasmine.addSpecFiles([
+            `${SRCDIR}test/fixtures/path1`,
+            `${SRCDIR}test/fixtures/path2`,
+        ]);
+        expect(testJasmine.specFiles).toMatchAllFiles([
+            `${SRCDIR}test/fixtures/path1/test.js`,
+            `${SRCDIR}test/fixtures/path2/test.js`,
+        ]);
+    });
+
     it('respects excluded files', function () {
         testJasmine.exclusions = ['otherSpec.js'];
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
         expect(testJasmine.specFiles).toMatchAllFiles([
             `${SRCDIR}test/fixtures/someSpec.js`,
+            `${SRCDIR}test/fixtures/path1/test.js`,
+            `${SRCDIR}test/fixtures/path2/test.js`,
         ]);
     });
 
-    it('matches when the paths match', function () {
+    it('matches at the end of the containing path', function () {
         testJasmine.exclusions = ['test/fixtures'];
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
-        expect(testJasmine.specFiles).toMatchAllFiles([]);
+        expect(testJasmine.specFiles).toMatchAllFiles([
+            `${SRCDIR}test/fixtures/path1/test.js`,
+            `${SRCDIR}test/fixtures/path2/test.js`,
+        ]);
     });
 
     it('can handle globs in excluded files', function () {
@@ -144,4 +162,13 @@ describe('Jasmine boot', function () {
         testJasmine.addReporter(fakeReporter);
         expect(fakeReporter.jasmine_core_path).toMatch('fake/jasmine/path');
     });
+
+    it('imports spec files in different directories with the same name', function () {
+        testJasmine.addSpecFiles([
+            `${SRCDIR}test/fixtures/path1`,
+            `${SRCDIR}test/fixtures/path2`,
+        ]);
+        expect(() => testJasmine.loadSpecs()).toThrowError(Error,
+            'Catch this error to ensure this file is loaded');
+    });
 });