Made tests pass and corrected behaviour for actions and init in projects

rocjs · Sep 22, 2016 · 10a9e71 · 10a9e71
1 parent 7524be2
commit 10a9e71
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/context/initContext.js b/src/context/initContext.js
@@ -124,19 +124,19 @@ export default function initContext({
                 handleResult({
                     actions: projectSpecific.actions,
                     config: omit(projectConfig, ['project']),
-                }, projectConfig.init({ verbose, directory, context })),
+                }, projectSpecific.init({ context })),
                 { context },
                 false,
                 true,
                 false
-            );
+            ).context;
         } else {
             context.config = merge(
                 context.config,
                 omit(projectConfig, ['project'])
             );
 
-            if (projectConfig.actions) {
+            if (projectSpecific.actions) {
                 // We allow both a function directly or an array of actions
                 const projectActions = isFunction(projectSpecific.actions) ?
                     [projectSpecific.actions] :