Merge lp:~chipaca/snapweb/www-tests into lp:~snappy-dev/snapweb/trunk

Proposed by John Lenton
Status: Work in progress
Proposed branch: lp:~chipaca/snapweb/www-tests
Merge into: lp:~snappy-dev/snapweb/trunk
Prerequisite: lp:~chipaca/snapweb/json-responses
Diff against target: 21 lines (+5/-1)
1 file modified
run-checks (+5/-1)
To merge this branch: bzr merge lp:~chipaca/snapweb/www-tests
Reviewer Review Type Date Requested Status
Sergio Schvezov Pending
Review via email: mp+258331@code.launchpad.net

This proposal supersedes a proposal from 2015-05-06.

Commit message

Run js unit tests from run-checks.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal

Looks good, but add the prereq ;-)

review: Approve
Revision history for this message
Stephen Stewart (stephen-stewart) wrote :

Is it worth adding an option to run karma without xvfb?

lp:~chipaca/snapweb/www-tests updated
115. By John Lenton

provide a way to override the js test runner

116. By John Lenton

silly chipaca is silly

Unmerged revisions

116. By John Lenton

silly chipaca is silly

115. By John Lenton

provide a way to override the js test runner

114. By John Lenton

run js unit tests from run-checks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-checks'
2--- run-checks 2015-05-03 20:46:35 +0000
3+++ run-checks 2015-05-06 09:29:19 +0000
4@@ -43,7 +43,7 @@
5 echo Running vet
6 go vet ./...
7
8- golint
9+# golint
10 echo Running lint
11 lint=$(golint ./...)
12 if [ -n "$lint" ]; then
13@@ -52,4 +52,8 @@
14 exit 1
15 fi
16
17+# js unit tests
18+echo "Running js unit tests (set JS_TESTER to override)"
19+( cd www && ${JS_TESTER:-xvfb-run ./node_modules/karma/bin/karma start --single-run} )
20+
21 echo "All good, what could possibly go wrong"

Subscribers

People subscribed via source and target branches

to all changes: