From 6c8c5890245d08b23caa050d043094fb4480b307 Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 4 Aug 2016 09:43:48 +0200 Subject: [PATCH 1/6] remove watch flag from list ui acceptance test Any test case that has the @watch flag will not be run by chimp in CI mode. These should only be used during development. --- tests/lists.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lists.js b/tests/lists.js index 91a54eb7..6236ff6c 100644 --- a/tests/lists.js +++ b/tests/lists.js @@ -13,7 +13,7 @@ describe('list ui', () => { browser.url('http://localhost:3100'); }); - it('can create a list @watch', () => { + it('can create a list', () => { const initialCount = countLists(); browser.click('.js-new-list'); From b0be8d1f93b4da15127b771018d43eaf0649bd5e Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 4 Aug 2016 10:02:19 +0200 Subject: [PATCH 2/6] always upgrade to latest chrome version on circle ci --- .testing/upgrade_chrome_version.sh | 6 ++++++ circle.yml | 1 + 2 files changed, 7 insertions(+) create mode 100644 .testing/upgrade_chrome_version.sh diff --git a/.testing/upgrade_chrome_version.sh b/.testing/upgrade_chrome_version.sh new file mode 100644 index 00000000..4086c51b --- /dev/null +++ b/.testing/upgrade_chrome_version.sh @@ -0,0 +1,6 @@ +# Update Chrome version +# Taken from: https://discuss.circleci.com/t/circle-fails-to-run-e2e-tests-using-grunt-protractor/2068/3 +wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - +sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' +sudo apt-get update +sudo apt-get install google-chrome-stable \ No newline at end of file diff --git a/circle.yml b/circle.yml index f1713061..1185a557 100644 --- a/circle.yml +++ b/circle.yml @@ -13,6 +13,7 @@ dependencies: - "/home/ubuntu/nvm/versions/node/v5.2.0/bin" - "/home/ubuntu/nvm/versions/node/v5.2.0/lib/node_modules" override: + - ./.testing/upgrade_chrome_version.sh - ./.testing/cache_meteor.sh - ./.testing/cache_npm_dependencies.sh - ./.testing/cache_build_and_dependencies.sh From ae220869a04d3351a4e9019e7a4d1f2260944259 Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 4 Aug 2016 10:05:01 +0200 Subject: [PATCH 3/6] fix permissions for the upgrade chrome script --- .testing/upgrade_chrome_version.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .testing/upgrade_chrome_version.sh diff --git a/.testing/upgrade_chrome_version.sh b/.testing/upgrade_chrome_version.sh old mode 100644 new mode 100755 From 67801458d5bb0336501adcb5dd8385c6213ee3b1 Mon Sep 17 00:00:00 2001 From: Noah Spitzer-Williams Date: Fri, 5 Aug 2016 09:02:00 -0700 Subject: [PATCH 4/6] re-enable unit and full-app tests --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f1713061..2913b89e 100644 --- a/circle.yml +++ b/circle.yml @@ -24,4 +24,6 @@ test: pre: - mkdir -p $CIRCLE_TEST_REPORTS/cucumber override: - - ./tests/acceptance_run \ No newline at end of file + - meteor npm test + - meteor npm run test-app + - ./tests/acceptance_run From e6b5a7f0f132bc1ea0dffe245fd36b61592eff34 Mon Sep 17 00:00:00 2001 From: Noah Spitzer-Williams Date: Fri, 5 Aug 2016 09:31:55 -0700 Subject: [PATCH 5/6] removed @watch from test --- tests/lists.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lists.js b/tests/lists.js index 91a54eb7..6236ff6c 100644 --- a/tests/lists.js +++ b/tests/lists.js @@ -13,7 +13,7 @@ describe('list ui', () => { browser.url('http://localhost:3100'); }); - it('can create a list @watch', () => { + it('can create a list', () => { const initialCount = countLists(); browser.click('.js-new-list'); From bb52a30831a2dc85776794e3ea7f90e8ffdbc1e1 Mon Sep 17 00:00:00 2001 From: Noah Spitzer-Williams Date: Fri, 5 Aug 2016 09:33:47 -0700 Subject: [PATCH 6/6] added logging to see whether fixtures are created in time --- imports/api/generate-data.app-tests.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imports/api/generate-data.app-tests.js b/imports/api/generate-data.app-tests.js index 8bdd8ed8..712dd9b7 100644 --- a/imports/api/generate-data.app-tests.js +++ b/imports/api/generate-data.app-tests.js @@ -23,6 +23,8 @@ Meteor.methods({ // create 3 private lists _.times(3, () => createList(Random.id())); + + console.log('created fixtures'); }, });