Merge pull request #41 from KaartGroup/fixup/phantom-removal

Fixup/phantom removal

.circleci/config.yml

@@ -57,7 +57,7 @@ jobs:
           mkdir $CIRCLE_WORKING_DIRECTORY/tests/client/junit
           export OPENSSL_CONF=/etc/ssl/
           $CIRCLE_WORKING_DIRECTORY/client/node_modules/.bin/karma start ./karma.conf.js \
-            --single-run --browsers PhantomJS --reporters junit
+            --single-run --browsers FirefoxHeadless,ChromeHeadless --reporters junit
         environment:
             JUNIT_REPORT_PATH: $CIRCLE_WORKING_DIRECTORY/tests/client/junit/
             JUNIT_REPORT_NAME: test-results.xml

Makefile

@@ -30,7 +30,7 @@ refresh-translations:
 tests:test-client test-server
 
 test-client:
-	docker-compose exec app sh -c "cd /usr/src/app/tests/client && ../../client/node_modules/.bin/karma start ./karma.conf.js --single-run --browsers PhantomJS"
+	docker-compose exec app sh -c "cd /usr/src/app/tests/client && ../../client/node_modules/.bin/karma start ./karma.conf.js --single-run --browsers FirefoxHeadless,ChromeHeadless"
 
 test-server:
 	docker-compose exec app sh -c "python -m unittest discover tests/server"

client/locale/en.json

@@ -757,7 +757,6 @@
 	"priority areas": "priority areas",
 	"read more in the what is new section.": "read more in the what is new section.",
 	"tasks.": "tasks.",
-	"this sequence as a gpx file to see the route.": "this sequence as a gpx file to see the route.",
 	"this task as a gpx file to see its boundary.": "this task as a gpx file to see its boundary.",
 	"will be deleted right before launch. All data will be replaced with existing TM2 projects as soon as the switch happens.": "will be deleted right before launch. All data will be replaced with existing TM2 projects as soon as the switch happens.",
 	"with any questions.": "with any questions."

client/package.json

@@ -40,10 +40,10 @@
     "jasmine-core": "~2.5.2",
     "jeet": "^7.1.0",
     "karma": "^4.4.1",
-    "karma-chrome-launcher": "^2.0.0",
+    "karma-chrome-launcher": ">=3.1.0",
+    "karma-firefox-launcher": ">=1.3.0",
     "karma-jasmine": "^1.1.0",
     "karma-junit-reporter": "^1.2.0",
-    "karma-phantomjs-launcher": "^1.0.4",
     "@mapbox/geo-viewport": "^0.4.0",
     "ment.io": "^0.9.23",
     "moment": "^2.24.0",