diff options
| author | Tulio Casagrande <tuliocasagrande@gmail.com> | 2017-02-20 14:43:10 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 14:43:10 -0300 |
| commit | 5a61fe569d469629922d3425cb580086d1d65433 (patch) | |
| tree | d58745a528422f90bb53f59b8078bd1dde2bddba /Makefile | |
| parent | 48a1ca5f8310ef6fb61dc821c38d435617b19d5c (diff) | |
| parent | 8177127b6b7282f816cb64595249ef1cb42ec0d8 (diff) | |
Merge pull request #980 from pixelated/interstitial-errors
[#907] Convert login page to react
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -2,7 +2,7 @@ VIRTUALENV=~/.venvs/pixua .PHONY: setup requirements install requirements_py install_py requirements_js install_js create_virtualenv .PHONY: test test_py test_js test_all linters linters_py linters_js coverage unit_tests_py unit_tests_js -.PHONY: integration_tests_py functional_tests ensure_phantomjs_installed ensure_virtualenv_installed clean +.PHONY: integration_tests_py functional_tests functional_tests_ci ensure_virtualenv_installed clean .PHONY: clean_all clean_py clean_js clean_cache remove_virtualenv remove_javascript_packages setup: install @@ -73,16 +73,16 @@ integration_tests: cd service;\ trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration -functional_tests: clean requirements install ensure_phantomjs_installed +functional_tests: clean requirements install @. $(VIRTUALENV)/bin/activate;\ + export PATH=$(PATH):/usr/lib/chromium/;\ cd service;\ - behave --tags ~@wip --tags ~@smoke test/functional/features + xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags ~@smoke test/functional/features -ensure_phantomjs_installed: - @if [ ! `which phantomjs` ]; then\ - echo "You need phantomJS to run these tests";\ - exit 1;\ - fi +functional_tests_ci: clean requirements install + @. $(VIRTUALENV)/bin/activate;\ + cd service;\ + behave --tags ~@wip --tags ~@smoke test/functional/features ensure_virtualenv_installed: @if [ ! `which virtualenv` ]; then\ |