diff --git a/packages/example/lib/example.js b/packages/example/lib/example.js index 9244273531..e8e3b40665 100644 --- a/packages/example/lib/example.js +++ b/packages/example/lib/example.js @@ -1,9 +1,19 @@ -const glob = require('glob') const path = require('path') +const glob = require('glob') module.exports = { getPathToExamples () { - return glob.sync(path.join(__dirname, '..', 'cypress', 'integration', 'examples', '**', '*')) + return glob.sync( + path.join( + __dirname, + '..', + 'cypress', + 'integration', + 'examples', + '**', + '*' + ) + ) }, getFolderName () { diff --git a/packages/example/package.json b/packages/example/package.json index 83c1dfb04d..790382a628 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -18,12 +18,14 @@ "cypress", "lib" ], + "dependencies": { + "glob": "^7.1.2" + }, "devDependencies": { "bin-up": "^1.1.0", "chai": "^3.5.0", "cross-env": "^5.0.5", "cypress-example-kitchensink": "1.0.1", - "glob": "^7.0.3", "gulp": "^3.9.1", "gulp-clean": "^0.3.1", "gulp-gh-pages": "^0.5.4", diff --git a/packages/server/lib/scaffold.coffee b/packages/server/lib/scaffold.coffee index b0d895ed6e..30ca8e8e5c 100644 --- a/packages/server/lib/scaffold.coffee +++ b/packages/server/lib/scaffold.coffee @@ -10,11 +10,12 @@ debug = require("debug")("cypress:server:scaffold") { equals, head, isEmpty, always } = require("ramda") { isDefault } = require("./util/config") +exampleFolderName = cypressEx.getFolderName() +exampleSpecsFullPaths = cypressEx.getPathToExamples() + getPathFromIntegrationFolder = (file) -> file.substring(file.indexOf("integration/") + "integration/".length) -exampleSpecsFullPaths = cypressEx.getPathToExamples() -exampleFolderName = cypressEx.getFolderName() ## short paths relative to integration folder (i.e. examples/actions.spec.js) exampleSpecs = _.map exampleSpecsFullPaths, (file) -> getPathFromIntegrationFolder(file) @@ -26,6 +27,7 @@ isDifferentNumberOfFiles = (files) -> exampleSpecsIndex = _.transform(exampleSpecs, (memo, spec, i) -> memo[spec] = exampleSpecsFullPaths[i] , {}) + getIndexedExample = (file) -> exampleSpecsIndex[getPathFromIntegrationFolder(file)] diff --git a/packages/server/package.json b/packages/server/package.json index d2f7e384c1..6f0fc93f0f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -36,7 +36,6 @@ "body-parser": "1.12.4", "chai-uuid": "^1.0.6", "chokidar-cli": "^1.2.0", - "cli-table2": "^0.2.0", "codecov": "^1.0.1", "coffee-coverage": "^1.0.1", "cors": "^2.8.3", @@ -90,6 +89,7 @@ "chokidar": "1.6.0", "cjsxify": "^0.3.0", "clear-module": "^2.1.0", + "cli-table2": "^0.2.0", "color-string": "^1.5.2", "compression": "1.1.0", "concat-stream": "^1.5.1",