summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--service/test/functional/features/environment.py2
2 files changed, 8 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 1d7a2343..322f5caa 100644
--- a/Makefile
+++ b/Makefile
@@ -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\
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py
index d49016b6..821a762b 100644
--- a/service/test/functional/features/environment.py
+++ b/service/test/functional/features/environment.py
@@ -63,7 +63,7 @@ def before_all(context):
def _setup_webdriver(context):
- browser = context.config.userdata.get('webdriver', 'phantomjs')
+ browser = context.config.userdata.get('webdriver', 'chrome')
supported_webdrivers = {
'phantomjs': webdriver.PhantomJS,
'firefox': webdriver.Firefox,