Merge remote-tracking branch 'origin/master' into release/3.3

# Conflicts: # CONTRIBUTING.md # scripts/test.js
storybookjs · Dec 6, 2017 · cc8e9b3 · cc8e9b3
2 parents efb5b7d + 873e39e
commit cc8e9b3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/test.js b/scripts/test.js
@@ -53,14 +53,14 @@ const tasks = {
     name: `React-Native example ${chalk.gray('(react-native-vanilla)')}`,
     defaultValue: true,
     option: '--reactnative',
-    projectLocation: './examples/react-native-vanilla',
+    projectLocation: path.join(__dirname, '..', 'examples/react-native-vanilla'),
     isJest: true,
   }),
   integration: createProject({
     name: `Screenshots of running apps ${chalk.gray('(integration)')}`,
     defaultValue: false,
     option: '--integration',
-    projectLocation: './integration',
+    projectLocation: path.join(__dirname, '..', 'integration'),
     isJest: true,
   }),
   // 'crna-kitchen-sink': createProject({