github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

allow PR testing - test fix - cypress fix

pull/50/head v0.47
Hunter Long 2018-08-20 00:27:57 -07:00
parent c16749444d
commit 61806ce3ab
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -56,7 +56,7 @@ before_script:
script: script:
- make test-all - 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: after_success:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then make travis-build; fi - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then make travis-build; fi

2
dev/Dockerfile-cypress
View File

@ -9,7 +9,7 @@ RUN npm install node-sass
ENV SASS=node-sass ENV SASS=node-sass
RUN npm install RUN npm install
ADD ./statup /usr/local/bin/statup ADD ./statup-linux-amd64 /usr/local/bin/statup
RUN statup version RUN statup version
RUN npm run test-docker RUN npm run test-docker

4
handlers/handlers_test.go
View File

@ -142,7 +142,9 @@ func TestServiceChartHandler(t *testing.T) {
assert.Equal(t, 200, rr.Code) assert.Equal(t, 200, rr.Code)
t.Log(body) t.Log(body)
assert.Contains(t, body, "var ctx_1") 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) { func TestDashboardHandler(t *testing.T) {