From 61806ce3ab828e5078e9c4058991ae6962edd9ad Mon Sep 17 00:00:00 2001
From: Hunter Long <Info@socialeck.com>
Date: Mon, 20 Aug 2018 00:27:57 -0700
Subject: [PATCH] allow PR testing - test fix - cypress fix

---
 .travis.yml               | 4 ++--
 dev/Dockerfile-cypress    | 2 +-
 handlers/handlers_test.go | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b66c780b..0451fd59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ before_script:
 
 script:
   - make test-all
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then make coverage; fi
 
 after_success:
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make travis-build; fi
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then make travis-build; fi
diff --git a/dev/Dockerfile-cypress b/dev/Dockerfile-cypress
index ff637a20..a921d5be 100644
--- a/dev/Dockerfile-cypress
+++ b/dev/Dockerfile-cypress
@@ -9,7 +9,7 @@ RUN npm install node-sass
 ENV SASS=node-sass
 RUN npm install
 
-ADD ./statup /usr/local/bin/statup
+ADD ./statup-linux-amd64 /usr/local/bin/statup
 RUN statup version
 
 RUN npm run test-docker
\ No newline at end of file
diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go
index 4727e420..6f6bcb65 100644
--- a/handlers/handlers_test.go
+++ b/handlers/handlers_test.go
@@ -142,7 +142,9 @@ func TestServiceChartHandler(t *testing.T) {
 	assert.Equal(t, 200, rr.Code)
 	t.Log(body)
 	assert.Contains(t, body, "var ctx_1")
-	assert.Contains(t, body, "var ctx_2")
+	assert.Contains(t, body, "var ctx_3")
+	assert.Contains(t, body, "var ctx_4")
+	assert.Contains(t, body, "var ctx_5")
 }
 
 func TestDashboardHandler(t *testing.T) {