From bfc6524b28f4b2b18aa0ec8954753d6b4acdab07 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Wed, 9 Oct 2019 09:30:22 +0200
Subject: [PATCH] Corrections

---
 .travis.yml | 16 +++++++++++----
 Makefile    | 56 +++++++++++++++++++++++++++--------------------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea23973de..962699057 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,7 +93,7 @@ jobs:
       rust: stable
       script: make test.unit crate=medea
 
-    - name: unit medea-jason (stable, Chrome, Firefox)
+    - name: unit medea-jason (stable, Chrome)
       stage: test
       rust: stable
       services: ["docker"]
@@ -101,9 +101,17 @@ jobs:
         - cargo uninstall wasm-bindgen-cli || echo > /dev/null
         - cargo install wasm-bindgen-cli
         - rustup target add wasm32-unknown-unknown
-      script:
-        - make test.unit crate=medea-jason dockerized=yes browser=chrome
-        - make test.unit crate=medea-jason dockerized=yes browser=firefox
+      script: make test.unit crate=medea-jason dockerized=yes browser=chrome
+
+    - name: unit medea-jason (stable, Firefox)
+      stage: test
+      rust: stable
+      services: ["docker"]
+      before_script:
+        - cargo uninstall wasm-bindgen-cli || echo > /dev/null
+        - cargo install wasm-bindgen-cli
+        - rustup target add wasm32-unknown-unknown
+      script: make test.unit crate=medea-jason dockerized=yes browser=firefox
 
     - name: E2E signalling (stable)
       stage: test
diff --git a/Makefile b/Makefile
index 47a782594..27c9d1c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ RUST_VER := 1.37
 CHROME_VERSION := 77.0
 FIREFOX_VERSION := 69.0
 
-CURRENT_BRANCH := $(strip $(shell git branch | grep \* | cut -d ' ' -f2))
+CURRENT_GIT_BRANCH := $(strip $(shell git branch | grep \* | cut -d ' ' -f2))
 
 crate-dir = .
 ifeq ($(crate),medea-jason)
@@ -314,12 +314,12 @@ ifeq ($(test-unit-crate),medea)
 	cargo test --lib --bin medea
 else
 ifeq ($(crate),medea-jason)
-	@make docker.up.webdriver
+	@make docker.up.webdriver browser=$(browser)
 	sleep 10
-	cd $(crate-dir)/ \
-		&& $(webdriver-env)="http://0.0.0.0:4444" \
-		cargo test --target wasm32-unknown-unknown --features mockable
-	@make docker.down.webdriver
+	cd $(crate-dir)/ && \
+	$(webdriver-env)="http://0.0.0.0:4444" \
+	cargo test --target wasm32-unknown-unknown --features mockable
+	@make docker.down.webdriver browser=$(browser)
 else
 	cd $(crate-dir)/ && \
 	cargo test -p $(test-unit-crate)
@@ -632,11 +632,13 @@ endif
 
 docker.up.webdriver: docker.down.webdriver
 ifeq ($(browser),firefox)
-	docker run --rm -d --shm-size 512m --name medea-webdriver-firefox \
-		--network=host instrumentisto/geckodriver:$(FIREFOX_VERSION)
+	docker run --rm -d --network=host --shm-size 512m \
+		--name medea-webdriver-firefox \
+		instrumentisto/geckodriver:$(FIREFOX_VERSION)
 else
-	docker run --rm -d --name medea-webdriver-chrome \
-		--network=host selenoid/chrome:$(CHROME_VERSION)
+	docker run --rm -d --network=host \
+		--name medea-webdriver-chrome \
+		selenoid/chrome:$(CHROME_VERSION)
 endif
 
 
@@ -746,7 +748,7 @@ endif
 		git add -v charts/ ; \
 		git commit -m "Release '$(helm-chart)' Helm chart" ; \
 	fi
-	git checkout $(CURRENT_BRANCH)
+	git checkout $(CURRENT_GIT_BRANCH)
 	git push origin gh-pages
 
 
@@ -823,19 +825,19 @@ endef
 ##################
 
 .PHONY: build build.jason build.medea \
-		cargo cargo.build cargo.fmt cargo.lint \
-		docker.auth docker.build.demo docker.build.medea \
-			docker.down.coturn docker.down.demo docker.down.medea \
-			docker.down.webdriver \
-			docker.pull docker.push \
-			docker.up.coturn docker.up.demo docker.up.medea \
-			docker.up.webdriver \
-		docs docs.rust \
-		down down.coturn down.demo down.dev down.medea \
-		helm helm.down helm.init helm.lint helm.list \
-			helm.package helm.package.release helm.up \
-		minikube.boot \
-		release release.crates release.helm release.npm \
-		test test.e2e test.unit \
-		up up.coturn up.demo up.dev up.jason up.medea \
-		yarn
+        cargo cargo.build cargo.fmt cargo.lint \
+        docker.auth docker.build.demo docker.build.medea \
+        	docker.down.coturn docker.down.demo docker.down.medea \
+        	docker.down.webdriver \
+        	docker.pull docker.push \
+        	docker.up.coturn docker.up.demo docker.up.medea \
+        	docker.up.webdriver \
+        docs docs.rust \
+        down down.coturn down.demo down.dev down.medea \
+        helm helm.down helm.init helm.lint helm.list \
+        	helm.package helm.package.release helm.up \
+        minikube.boot \
+        release release.crates release.helm release.npm \
+        test test.e2e test.unit \
+        up up.coturn up.demo up.dev up.jason up.medea \
+        yarn