Skip to content
This repository has been archived by the owner on Feb 26, 2021. It is now read-only.

re-enable unit and full-app tests #172

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .testing/upgrade_chrome_version.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,4 +25,6 @@ test:
pre:
- mkdir -p $CIRCLE_TEST_REPORTS/cucumber
override:
- ./tests/acceptance_run
- meteor npm test
- meteor npm run test-app
- ./tests/acceptance_run
2 changes: 2 additions & 0 deletions imports/api/generate-data.app-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Meteor.methods({

// create 3 private lists
_.times(3, () => createList(Random.id()));

console.log('created fixtures');
},
});

Expand Down
2 changes: 1 addition & 1 deletion tests/lists.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down