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

Commit

Permalink
Port tests to use live server rather than mocks
Browse files Browse the repository at this point in the history
This also fixes various inconsistencies in the tests and accounts for
a stateful server.

Fix #459

Signed-off-by: Byron Ruth <b@devel.io>
  • Loading branch information
bruth committed Mar 14, 2014
1 parent be6b6ba commit 1ed090b
Show file tree
Hide file tree
Showing 52 changed files with 626 additions and 3,415 deletions.
15 changes: 4 additions & 11 deletions .travis.yml
Expand Up @@ -7,25 +7,18 @@ virtualenv:
system_site_packages: true

before_install:
- env | sort
- sudo apt-get update -qq
- sudo apt-get install -qq python-yaml
- git remote add upstream git://github.com/cbmi/cilantro.git
- upstream=master;
if [ "$TRAVIS_PULL_REQUEST" != false ]; then
upstream=$TRAVIS_BRANCH;
fi;
git fetch --append --no-tags upstream refs/heads/$upstream:refs/remotes/upstream/$upstream
- /usr/bin/python bin/check_signoff.py
- sh bin/check_signoff.sh


install:
- git clone --branch demo git://github.com/cbmi/harvest-openmrs.git
- pip install -r harvest-openmrs/requirements.txt
- pip install uwsgi
- npm install -g grunt-cli
- npm install

before_script:
- python harvest-openmrs/bin/manage.py runserver --traceback &
- uwsgi --http :8000 --chdir harvest-openmrs --wsgi-file wsgi.py &

script:
- grunt test --verbose
1 change: 1 addition & 0 deletions Gruntfile.coffee
Expand Up @@ -256,6 +256,7 @@ module.exports = (grunt) ->
options:
specs: '<%= specDir %>/**/**/**/*.js'
host: 'http://127.0.0.1:8126'
helpers: './specConfig.js'
keepRunner: true
template: require('grunt-template-jasmine-requirejs')

Expand Down
19 changes: 19 additions & 0 deletions bin/check_signoff.sh
@@ -0,0 +1,19 @@
#!/bin/sh

env | sort

sudo apt-get update -qq
sudo apt-get install -qq python-yaml

git remote add upstream git://github.com/cbmi/cilantro.git

UPSTREAM=master
DIRNAME=$( cd "$( dirname "$0" )" && pwd )

if [ "$TRAVIS_PULL_REQUEST" != false ]; then
UPSTREAM=$TRAVIS_BRANCH;
fi;

git fetch --append --no-tags upstream refs/heads/$UPSTREAM:refs/remotes/upstream/$UPSTREAM

/usr/bin/python "$DIRNAME/check_signoff.py"
80 changes: 0 additions & 80 deletions mock/concepts-28-fields.json

This file was deleted.

60 changes: 0 additions & 60 deletions mock/concepts-31-fields.json

This file was deleted.

74 changes: 0 additions & 74 deletions mock/concepts-50-fields.json

This file was deleted.

0 comments on commit 1ed090b

Please sign in to comment.