From 16190197f72ea242ae239dc2741e2887c7008dfa Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 8 Feb 2017 10:55:10 -0200 Subject: [#922] Add test coverage for new js files Since this added a lot of scripts to our npm scripts, this commit also organizes the package.json. with @tayanefernandes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a263ec42..1d7a2343 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ linters_py: linters_js: @cd web-ui;\ - npm run jshint + npm run lint coverage: @. $(VIRTUALENV)/bin/activate;\ -- cgit v1.2.3 From 200ba568e4c975cc5276676b2406170aa85dcad1 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Fri, 17 Feb 2017 15:47:01 -0200 Subject: [#907] Change default webdriver to chrome with @anikarni --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Makefile') 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\ -- cgit v1.2.3 From fc1c230b3dfddf6a1092cca761202083c5cec444 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Fri, 17 Feb 2017 16:50:53 -0200 Subject: [#907] Add chromedriver to vagrant for functional tests with @anikarni --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 322f5caa..bca2cf91 100644 --- a/Makefile +++ b/Makefile @@ -75,6 +75,7 @@ integration_tests: functional_tests: clean requirements install @. $(VIRTUALENV)/bin/activate;\ + export PATH=$(PATH):/usr/lib/chromium/;\ cd service;\ xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags ~@smoke test/functional/features -- cgit v1.2.3 From 98a781c49a35986d426b70c6cc9c11a4041a0ca6 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 21 Feb 2017 10:35:20 -0300 Subject: Fix integration tests tag with @anikarni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bca2cf91..826211c3 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ unit_tests_js: @cd web-ui;\ npm run test -integration_tests: +integration_tests_py: @. $(VIRTUALENV)/bin/activate;\ cd service;\ trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration -- cgit v1.2.3 From f21558d8ceea177a26096e4922eef02413394058 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 21 Feb 2017 13:27:57 -0300 Subject: Remove multiple workers for integration tests with @anikarni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 826211c3..86567e3b 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ unit_tests_js: integration_tests_py: @. $(VIRTUALENV)/bin/activate;\ cd service;\ - trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration + trial --reporter=text test.integration functional_tests: clean requirements install @. $(VIRTUALENV)/bin/activate;\ -- cgit v1.2.3