diff --git a/.travis.yml b/.travis.yml index ade6a0c..33ff1f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,6 @@ language: python python: - 3.5 -cache: - directories: - - sysconfcpus - addons: postgresql: "9.6" @@ -19,31 +15,17 @@ env: - DATABASE_URL="postgres://postgres@localhost/jarbas" before_install: - - | - if [ ! -d sysconfcpus/bin ]; - then - git clone https://github.com/obmarg/libsysconfcpus.git; - cd libsysconfcpus; - ./configure --prefix=$TRAVIS_BUILD_DIR/sysconfcpus; - make && make install; - cd ..; - fi - - nvm install 6 - - nvm use 6 - python -m pip install -U pip install: - psql -U postgres -c 'create database "jarbas";' - - npm install - python -m pip install -r requirements-dev.txt coveralls before_script: - - $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 npm run assets - python manage.py migrate - python manage.py collectstatic --no-input script: - - $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 npm test - coverage run manage.py test -v 3 after_success: diff --git a/elm-package.json b/elm-package.json index e76ed86..cc0ba67 100644 --- a/elm-package.json +++ b/elm-package.json @@ -12,15 +12,13 @@ "MichaelCombs28/elm-mdl": "1.0.1 <= v < 2.0.0", "NoRedInk/elm-decode-pipeline": "3.0.0 <= v < 4.0.0", "cuducos/elm-format-number": "2.0.0 <= v < 3.0.0", - "elm-community/elm-test": "3.1.0 <= v < 4.0.0", "elm-community/json-extra": "2.1.0 <= v < 3.0.0", "elm-community/list-extra": "5.0.1 <= v < 6.0.0", "elm-lang/core": "5.0.0 <= v < 6.0.0", "elm-lang/html": "2.0.0 <= v < 3.0.0", "elm-lang/http": "1.0.0 <= v < 2.0.0", "elm-lang/navigation": "2.0.1 <= v < 3.0.0", - "rluiten/elm-date-extra": "8.2.0 <= v < 9.0.0", - "rtfeldman/node-test-runner": "3.0.0 <= v < 4.0.0" + "rluiten/elm-date-extra": "8.2.0 <= v < 9.0.0" }, "elm-version": "0.18.0 <= v < 0.19.0" } diff --git a/jarbas/frontend/tests/elm-doc-test.json b/jarbas/frontend/tests/elm-doc-test.json deleted file mode 100644 index 2e21041..0000000 --- a/jarbas/frontend/tests/elm-doc-test.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "root": "../elm", - "tests": [ - "Format.CnpjCpf", - "Format.Date", - "Format.Price", - "Format.Url", - "Internationalization", - "Layout", - "Main", - "Model", - "Reimbursement.Company.Decoder", - "Reimbursement.Company.Model", - "Reimbursement.Company.Update", - "Reimbursement.Company.View", - "Reimbursement.Decoder", - "Reimbursement.Fields", - "Reimbursement.Map.Model", - "Reimbursement.Map.Update", - "Reimbursement.Map.View", - "Reimbursement.Model", - "Reimbursement.Receipt.Decoder", - "Reimbursement.Receipt.Model", - "Reimbursement.Receipt.Update", - "Reimbursement.Receipt.View", - "Reimbursement.RelatedTable.Decoder", - "Reimbursement.RelatedTable.Model", - "Reimbursement.RelatedTable.Update", - "Reimbursement.RelatedTable.View", - "Reimbursement.SameDay.Update", - "Reimbursement.SameDay.View", - "Reimbursement.SameSubquota.Update", - "Reimbursement.SameSubquota.View", - "Reimbursement.Search.Model", - "Reimbursement.Search.Update", - "Reimbursement.Search.View", - "Reimbursement.Update", - "Reimbursement.View", - "Update", - "View" - ] -} diff --git a/package.json b/package.json index 399ba6a..328b248 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,10 @@ "scripts": { "postinstall": "elm-package install --yes", "assets": "gulp elm", - "watch": "gulp watch", - "pretest": "sed 's/\\/jarbas\\/frontend/./g' elm-package.json > jarbas/frontend/tests/elm-package.json && cd jarbas/frontend/ && elm-doc-test", - "test": "elm-test jarbas/frontend/tests/Doc/Main.elm", - "posttest": "rm jarbas/frontend/tests/elm-package.json" + "watch": "gulp watch" }, "dependencies": { "elm": "^0.18", - "elm-doc-test": "^2.1.1", - "elm-test": "^0.18.2", "gulp": "^3.9.1", "gulp-cli": "^1.2.2", "gulp-elm": "^0.7.2",