Merge branch 'foo'

getgauge · Jun 1, 2019 · 24141ef · 24141ef
2 parents fd7c184 + a121a7f
commit 24141ef
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/launcher.js b/launcher.js
@@ -57,7 +57,9 @@ let packageJson = `
   "dependencies": {
     "gauge-ts": "latest",
     "ts-node": "latest",
-    "typescript": "latest",
+    "typescript": "latest"
+  },
+  "devDependencies": {
     "@types/node": "latest"
   }
 }

diff --git a/package.json b/package.json
@@ -15,7 +15,12 @@
     "type": "git",
     "url": "git+https://github.com/bugdiver/gauge-ts.git"
   },
-  "keywords": ["gauge", "acceptence test", "typescript", "automaiton" ],
+  "keywords": [
+    "gauge",
+    "acceptence test",
+    "typescript",
+    "automaiton"
+  ],
   "author": "BugDiver <[email protected]>",
   "license": "MIT",
   "bugs": {

diff --git a/src/loaders/ImplLoader.ts b/src/loaders/ImplLoader.ts
@@ -1,24 +1,24 @@
-import { CodeHelper } from "../helpers/CodeHelper";
 import hookRegistry from "../models/HookRegistry";
 import registry from "../models/StepRegistry";
 import { Util } from "../utils/Util";
 
-export class ImplLoader extends CodeHelper {
+
+export class ImplLoader {
 
     public async loadImplementations() {
         registry.clear();
         hookRegistry.clear();
         for (const file of Util.getListOfFiles()) {
             process.env.STEP_FILE_PATH = file;
             let c = await Util.importFile(file);
-            if (c.default && c.default.length == 0) {
-                try {
+            try {
+                if (c.default && c.default.length == 0) {
                     let instance = new c.default();
                     this.updateRegsitry(file, instance);
-                } catch (error) {
-                    console.error('Failed to create a instasnce of exported class from ' + file +
-                        `Step implemetations classes needs to exported default witout any constructor`);
                 }
+            } catch (error) {
+                error.message = `${error.message}. Step implemetations classes needs to be exported as default witout any constructor`
+                console.error(error);
             }
         }
     }
@@ -27,4 +27,4 @@ export class ImplLoader extends CodeHelper {
         registry.setInstanceForMethodsIn(file, instance);
         hookRegistry.setInstanceForMethodsIn(file, instance)
     }
-}
+}
diff --git a/tests/processors/MessageProcessorFactoryTests.ts b/tests/processors/MessageProcessorFactoryTests.ts
@@ -36,8 +36,24 @@ describe('MessageProcessorFactory', () => {
                 messageType: gauge.messages.Message.MessageType.ExecutionStarting,
                 executionStartingRequest: new gauge.messages.ExecutionStartingRequest()
             })
+            console.error = jest.fn();
+            let err = jest.spyOn(console, 'error');
             await factory.process(message);
+            expect(err).toBeCalledTimes(0);
+        })
 
+        it('should load impl before loading files which fails to create instance', async () => {
+            Util.getListOfFiles = jest.fn().mockReturnValue(['StepImpl.ts']);
+            Util.importFile = jest.fn().mockResolvedValue({ default: () => { } })
+            let message = new gauge.messages.Message({
+                messageId: 0,
+                messageType: gauge.messages.Message.MessageType.ExecutionStarting,
+                executionStartingRequest: new gauge.messages.ExecutionStartingRequest()
+            })
+            console.error = jest.fn();
+            let err = jest.spyOn(console, 'error');
+            await factory.process(message);
+            expect(err).toHaveBeenCalled();
         })
 
         it('should process unsupport message', async () => {
@@ -51,5 +67,4 @@ describe('MessageProcessorFactory', () => {
             expect(mockExit).toHaveBeenCalledWith(1);
         })
     })
-
 })