Skip to content

Commit

Permalink
Merge pull request #108 from fga-gpp-mds/TS30_JavaScriptTestingEnviro…
Browse files Browse the repository at this point in the history
…nment

Ts30 java script testing environment
  • Loading branch information
pablodiegoss authored Dec 12, 2017
2 parents 46b1fd1 + d486f50 commit cf67ef5
Show file tree
Hide file tree
Showing 30 changed files with 248 additions and 8,834 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@

__pycache__/

*.pyc

*.sqlite3

\.cache/v/cache/
Expand All @@ -25,3 +22,8 @@ package-lock\.json
celerybeat-schedule

celerybeat\.pid

# karma files

coverage/
npm-debug.log
20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
up:
sudo docker-compose up -d web
sudo docker-compose up -d postgres
sleep 30
sudo docker-compose exec postgres psql metabase quero_cultura -f /postgres_metabase/metabase.sql
sudo docker-compose up -d metabase
sudo docker-compose up -d nginx

down:
sudo docker-compose down --volume

test-js:
sudo docker-compose -f docker-compose.testjs.yml up

test-py:
sudo docker-compose up -d web
sudo docker-compose exec web py.test

logs:
sudo docker-compose logs -f
8 changes: 8 additions & 0 deletions docker-compose.testjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# karma get a javascript coverage and execute javascript tests
karma:
image: hochzehn/karma-jasmine-phantomjs
command: start
volumes:
- .:/opt/karma
ports:
- "9876:9876"
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ services:
- ".:/dkr"
- "/var/run/docker.sock:/var/run/docker.sock"
command: docker exec 20172querocultura_postgres_1 bash -c "sleep 15 && psql metabase quero_cultura -f /postgres_metabase/metabase.sql"

depends_on:
- postgres

133 changes: 0 additions & 133 deletions jasmine/boot.js

This file was deleted.

190 changes: 0 additions & 190 deletions jasmine/console.js

This file was deleted.

Loading

0 comments on commit cf67ef5

Please sign in to comment.