From 599d3502fd843bd2387b1349389fd5f1e1d6ce87 Mon Sep 17 00:00:00 2001 From: Maxime Thirouin Date: Thu, 3 Nov 2016 08:33:19 +0100 Subject: [PATCH] Rename test-phenomic-theme-base to test-setup --- .flowconfig | 2 +- .gitignore | 2 +- .travis.yml | 2 +- appveyor.yml | 2 +- e2e-tests/README.md | 2 +- e2e-tests/__tests__/cli-build.js | 2 +- e2e-tests/__tests__/utils/index.js | 2 +- package.json | 8 ++++---- scripts/{test-phenomic-theme-base.js => test-setup.js} | 6 +++--- scripts/utils/test-folder.js | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename scripts/{test-phenomic-theme-base.js => test-setup.js} (72%) diff --git a/.flowconfig b/.flowconfig index 73159e7df..93b0e4ccb 100644 --- a/.flowconfig +++ b/.flowconfig @@ -1,7 +1,7 @@ [ignore] .*/node_modules/.* .*/docs/node_modules/.* -.*/test-phenomic-theme-base/.* +.*/test-setup/.* .*/lib/.* .*/coverage/.* .*/.nyc_output/.* diff --git a/.gitignore b/.gitignore index 802db8025..0327a0c86 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ docs/content/assets/showcases/* # phenomic-theme-base files to work on it themes/phenomic-theme-base/dist -test-phenomic-theme-base +test-setup # logo logo/*.png diff --git a/.travis.yml b/.travis.yml index 831379f15..72d1ce259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: directories: - node_modules - phenomic-theme-base/node_modules - - test-phenomic-theme-base/node_modules + - test-setup/node_modules - docs/node_modules before_install: diff --git a/appveyor.yml b/appveyor.yml index 2ffa70c99..2752808be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ matrix: cache: - node_modules -> package.json - phenomic-theme-base/node_modules -> package.json - - test-phenomic-theme-base/node_modules -> package.json + - test-setup/node_modules -> package.json - docs/node_modules -> package.json install: diff --git a/e2e-tests/README.md b/e2e-tests/README.md index 93a8e1542..57d21be1b 100644 --- a/e2e-tests/README.md +++ b/e2e-tests/README.md @@ -7,7 +7,7 @@ Tests here need to be run with a transpiled sources & a test folder ready to run ```console npm run transpile -npm run test-phenomic-theme-base:prepare +npm run test-setup:prepare npm run e2e:tests ``` diff --git a/e2e-tests/__tests__/cli-build.js b/e2e-tests/__tests__/cli-build.js index 559a0b1fe..c316494c7 100644 --- a/e2e-tests/__tests__/cli-build.js +++ b/e2e-tests/__tests__/cli-build.js @@ -18,7 +18,7 @@ it("should build the base theme correctly", reject("Build should work") } - const testFolder = __dirname + "/../../test-phenomic-theme-base/dist" + const testFolder = __dirname + "/../../test-setup/dist" const files = globby.sync("**/*", { cwd: testFolder, nodir: true, diff --git a/e2e-tests/__tests__/utils/index.js b/e2e-tests/__tests__/utils/index.js index c0e67f310..5b22c920b 100644 --- a/e2e-tests/__tests__/utils/index.js +++ b/e2e-tests/__tests__/utils/index.js @@ -4,7 +4,7 @@ import { readFileSync } from "fs" export { exec } from "child_process" const target = join( - __dirname, "..", "..", "..", "test-phenomic-theme-base" + __dirname, "..", "..", "..", "test-setup" ) export const execOpts = { cwd: target, stdio: "inherit" } diff --git a/package.json b/package.json index 33de0cf15..9e6340859 100644 --- a/package.json +++ b/package.json @@ -157,9 +157,9 @@ "phenomic-theme-base-linting": "eslint --config package.json --ignore-path .gitignore --fix themes/phenomic-theme-base/scripts themes/phenomic-theme-base/src", "prephenomic-theme-base-start": "npm run transpile && npm run phenomic-theme-base", "phenomic-theme-base-start": "cd themes/phenomic-theme-base && npm start", - "test-phenomic-theme-base:prepare": "babel-node scripts/test-phenomic-theme-base.js", - "pretest-phenomic-theme-base": "npm run test-phenomic-theme-base:prepare", - "test-phenomic-theme-base": "cd test-phenomic-theme-base && npm test", + "test-setup:prepare": "babel-node scripts/test-setup.js", + "pretest-setup": "npm run test-setup:prepare", + "test-setup": "cd test-setup && npm test", "docs": "babel-node scripts/docs.js", "docs-linting": "eslint --ignore-path .gitignore --fix docs/scripts docs/src", "docs-webpack-2": "npm i webpack@^2.1.0-beta.25 && babel-node scripts/docs.js && cd docs && npm i extract-text-webpack-plugin@^2.0.0-beta.4", @@ -173,7 +173,7 @@ "predocs-deploy": "cd docs && npm run showcase-screenshots && npm run build", "docs-deploy": "cd docs && ./scripts/deploy.sh", "pretest": "npm run transpile && npm run lint", - "test": "npm run tests && npm run phenomic-theme-base && npm run phenomic-theme-base-linting && npm run test-phenomic-theme-base && npm run e2e:tests", + "test": "npm run tests && npm run phenomic-theme-base && npm run phenomic-theme-base-linting && npm run test-setup && npm run e2e:tests", "posttest": "npm run test-docs", "coverage": "cat ./coverage/lcov.info | coveralls", "release": "npmpub", diff --git a/scripts/test-phenomic-theme-base.js b/scripts/test-setup.js similarity index 72% rename from scripts/test-phenomic-theme-base.js rename to scripts/test-setup.js index 839dda0b1..3a3b8d260 100644 --- a/scripts/test-phenomic-theme-base.js +++ b/scripts/test-setup.js @@ -3,14 +3,14 @@ import globby from "globby" import testFolder, { exec } from "./utils/test-folder.js" -const target = "test-phenomic-theme-base" +const target = "test-setup" testFolder( target, { - // test-phenomic-theme-base cleanu + // test-setup cleanu cleanup: async () => Promise.all( - globby.sync("test-phenomic-theme-base/!(node_modules)", { dot: true }) + globby.sync("test-setup/!(node_modules)", { dot: true }) .map( (file) => remove(file) ), diff --git a/scripts/utils/test-folder.js b/scripts/utils/test-folder.js index db068be87..581ecca2e 100644 --- a/scripts/utils/test-folder.js +++ b/scripts/utils/test-folder.js @@ -1,4 +1,4 @@ -// All these weird steps for this 'simple' test-phenomic-theme-base has been +// All these weird steps for this 'simple' test-setup has been // made to boost CI testing, tune with care if you dare to import pify from "pify"