From 27ebf9d71138733f8472c8f0bde171168aae538b Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Fri, 29 Jan 2016 13:58:52 +0100 Subject: [PATCH] Move visual tests to /test/gemini folder --- package.json | 6 +++--- .gemini.yml => test/gemini/.gemini.yml | 20 +++++++++---------- .../gemini/README.md | 3 ++- .../gemini/tests}/main/authenticated.js | 0 {gemini => test/gemini/tests}/main/basic.js | 0 {gemini => test/gemini/tests}/main/detail.js | 0 .../gemini/tests}/whitelabel/23vivi/23vivi.js | 0 .../gemini/tests}/whitelabel/cyland/cyland.js | 0 .../tests}/whitelabel/ikonotv/ikonotv.js | 0 .../tests}/whitelabel/lumenus/lumenus.js | 0 .../whitelabel/shared/whitelabel_basic.js | 0 11 files changed, 15 insertions(+), 14 deletions(-) rename .gemini.yml => test/gemini/.gemini.yml (89%) rename docs/visual-regression-testing.md => test/gemini/README.md (97%) rename {gemini => test/gemini/tests}/main/authenticated.js (100%) rename {gemini => test/gemini/tests}/main/basic.js (100%) rename {gemini => test/gemini/tests}/main/detail.js (100%) rename {gemini => test/gemini/tests}/whitelabel/23vivi/23vivi.js (100%) rename {gemini => test/gemini/tests}/whitelabel/cyland/cyland.js (100%) rename {gemini => test/gemini/tests}/whitelabel/ikonotv/ikonotv.js (100%) rename {gemini => test/gemini/tests}/whitelabel/lumenus/lumenus.js (100%) rename {gemini => test/gemini/tests}/whitelabel/shared/whitelabel_basic.js (100%) diff --git a/package.json b/package.json index 42c8bba9..5e72b863 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "test": "npm run sauce-test", "sauce-test": "mocha ./test/integration/tests/", "tunnel": "node ./test/integration/tunnel.js", - "vi-clean": "rm -rf gemini-report", + "vi-clean": "rm -rf ./gemini-report", "vi-phantom": "phantomjs --webdriver=4444", - "vi-update": "gemini update", - "vi-test": "npm run vi-clean && gemini test --reporter html --reporter vflat || true", + "vi-update": "gemini update -c ./test/gemini/.gemini.yml", + "vi-test": "npm run vi-clean && gemini test -c ./test/gemini/.gemini.yml --reporter html --reporter vflat || true", "vi-test:all": "npm run vi-test", "vi-test:main": "npm run vi-test -- --browser MainDesktop --browser MainMobile", "vi-test:whitelabel": "GEMINI_BROWSERS='CcDesktop, CcMobile, CylandDesktop, CylandMobile, IkonotvDesktop, IkonotvMobile, LumenusDesktop, LumenusMobile, 23viviDesktop, 23viviMobile' npm run vi-test", diff --git a/.gemini.yml b/test/gemini/.gemini.yml similarity index 89% rename from .gemini.yml rename to test/gemini/.gemini.yml index a04903eb..f64d865f 100644 --- a/.gemini.yml +++ b/test/gemini/.gemini.yml @@ -89,45 +89,45 @@ browsers: sets: main: files: - - gemini/main + - tests/main browsers: - MainDesktop - MainMobile cc: files: - - gemini/whitelabel/shared + - tests/whitelabel/shared browsers: - CcDesktop - CcMobile cyland: files: - - gemini/whitelabel/shared - - gemini/whitelabel/cyland + - tests/whitelabel/shared + - tests/whitelabel/cyland browsers: - CylandDesktop - CylandMobile ikonotv: files: - - gemini/whitelabel/shared - - gemini/whitelabel/ikonotv + - tests/whitelabel/shared + - tests/whitelabel/ikonotv browsers: - IkonotvDesktop - IkonotvMobile lumenus: files: - - gemini/whitelabel/shared - - gemini/whitelabel/lumenus + - tests/whitelabel/shared + - tests/whitelabel/lumenus browsers: - LumenusDesktop - LumenusMobile 23vivi: files: - - gemini/whitelabel/shared - - gemini/whitelabel/23vivi + - tests/whitelabel/shared + - tests/whitelabel/23vivi browsers: - 23viviDesktop - 23viviMobile diff --git a/docs/visual-regression-testing.md b/test/gemini/README.md similarity index 97% rename from docs/visual-regression-testing.md rename to test/gemini/README.md index 35d328f0..da1712d9 100644 --- a/docs/visual-regression-testing.md +++ b/test/gemini/README.md @@ -24,6 +24,7 @@ Then, install [PhantomJS2](https://www.npmjs.com/package/phantomjs2): ```bash # Until phantomjs2 is updated for the new 2.1 version of PhantomJS, use the following (go to https://bitbucket.org/ariya/phantomjs/downloads to find a build for your OS) npm install -g phantomjs2 --phantomjs_downloadurl=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip +npm install --save-dev phantomjs2 --phantomjs_downloadurl=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip # If using OSX, you may have to install upx and decompress the binary downloaded by npm manually: brew install upx @@ -121,7 +122,7 @@ See [the docs](https://github.com/gemini-testing/gemini/blob/master/doc/tests.md actions](https://github.com/gemini-testing/gemini/blob/master/doc/tests.md#available-actions) for what scripted actions are available. -Our tests are located in `onion/gemini/`. +Our tests are located in `onion/test/gemini/tests/`. **It would be nice if we kept the whitelabels up to date.** diff --git a/gemini/main/authenticated.js b/test/gemini/tests/main/authenticated.js similarity index 100% rename from gemini/main/authenticated.js rename to test/gemini/tests/main/authenticated.js diff --git a/gemini/main/basic.js b/test/gemini/tests/main/basic.js similarity index 100% rename from gemini/main/basic.js rename to test/gemini/tests/main/basic.js diff --git a/gemini/main/detail.js b/test/gemini/tests/main/detail.js similarity index 100% rename from gemini/main/detail.js rename to test/gemini/tests/main/detail.js diff --git a/gemini/whitelabel/23vivi/23vivi.js b/test/gemini/tests/whitelabel/23vivi/23vivi.js similarity index 100% rename from gemini/whitelabel/23vivi/23vivi.js rename to test/gemini/tests/whitelabel/23vivi/23vivi.js diff --git a/gemini/whitelabel/cyland/cyland.js b/test/gemini/tests/whitelabel/cyland/cyland.js similarity index 100% rename from gemini/whitelabel/cyland/cyland.js rename to test/gemini/tests/whitelabel/cyland/cyland.js diff --git a/gemini/whitelabel/ikonotv/ikonotv.js b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js similarity index 100% rename from gemini/whitelabel/ikonotv/ikonotv.js rename to test/gemini/tests/whitelabel/ikonotv/ikonotv.js diff --git a/gemini/whitelabel/lumenus/lumenus.js b/test/gemini/tests/whitelabel/lumenus/lumenus.js similarity index 100% rename from gemini/whitelabel/lumenus/lumenus.js rename to test/gemini/tests/whitelabel/lumenus/lumenus.js diff --git a/gemini/whitelabel/shared/whitelabel_basic.js b/test/gemini/tests/whitelabel/shared/whitelabel_basic.js similarity index 100% rename from gemini/whitelabel/shared/whitelabel_basic.js rename to test/gemini/tests/whitelabel/shared/whitelabel_basic.js