Added a test for using the provided loader to load reporters

jasmine · Jan 9, 2022 · 1ae44b5 · 1ae44b5
1 parent e248807
commit 1ae44b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/command.js b/lib/command.js
@@ -1,6 +1,5 @@
 const path = require('path');
 const fs = require('fs');
-const Loader = require('./loader');
 
 exports = module.exports = Command;
 
@@ -166,7 +165,7 @@ async function registerReporter(reporterModuleName, jasmine) {
   let Reporter;
 
   try {
-    Reporter = await (jasmine.loader || new Loader()).load(resolveReporter(reporterModuleName));
+    Reporter = await jasmine.loader.load(resolveReporter(reporterModuleName));
   } catch (e) {
     throw new Error('Failed to load reporter module '+ reporterModuleName +
       '\nUnderlying error: ' + e.stack + '\n(end underlying error)');

diff --git a/spec/command_spec.js b/spec/command_spec.js
@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const Command = require('../lib/command');
+const Loader = require("../lib/loader");
 
 const projectBaseDir = 'spec/fixtures/sample_empty_project/';
 const spec = path.join(projectBaseDir, 'spec');
@@ -54,6 +55,7 @@ describe('command', function() {
 
     this.fakeJasmine = jasmine.createSpyObj('jasmine', ['loadConfigFile', 'addHelperFiles', 'addRequires', 'showColors', 'execute',
       'randomizeTests', 'seed', 'coreVersion', 'clearReporters', 'addReporter']);
+    this.fakeJasmine.loader = new Loader();
     this.fakeJasmine.env = jasmine.createSpyObj('env', ['configure']);
     this.fakeJasmine.execute.and.returnValue(Promise.resolve());
   });
@@ -272,6 +274,15 @@ describe('command', function() {
       expect(this.fakeJasmine.addReporter).toHaveBeenCalledWith(jasmine.any(Reporter));
     });
 
+    it('uses the provided loader to load reporters', async function() {
+      const reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'customReporter.js'));
+      spyOn(this.fakeJasmine.loader, 'load').and.callThrough();
+
+      await this.command.run(this.fakeJasmine, ['--reporter=' + reporterPath]);
+
+      expect(this.fakeJasmine.loader.load).toHaveBeenCalledWith(reporterPath);
+    });
+
     it('can specify a reporter that is an ES module', async function() {
       await this.command.run(this.fakeJasmine, ['--reporter=./spec/fixtures/customReporter.mjs']);
       expect(this.fakeJasmine.clearReporters).toHaveBeenCalled();