diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-02-17 15:47:01 -0200 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-02-17 15:47:01 -0200 |
| commit | 200ba568e4c975cc5276676b2406170aa85dcad1 (patch) | |
| tree | 52357b8a3c3687f34dbdad55ca465d5caf42db7f /Makefile | |
| parent | 85aa0455d5accb392cf6bc3b5fc44bc8b8da4350 (diff) | |
[#907] Change default webdriver to chrome
with @anikarni
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 7 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,15 @@ 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;\ 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\ |