Merge lp://staging/~stephen-stewart/ulysses/fix-jenkins-testing into lp://staging/ulysses
Proposed by
Stephen Stewart
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Stephen Stewart | ||||||||||||
| Approved revision: | 49 | ||||||||||||
| Merged at revision: | 45 | ||||||||||||
| Proposed branch: | lp://staging/~stephen-stewart/ulysses/fix-jenkins-testing | ||||||||||||
| Merge into: | lp://staging/ulysses | ||||||||||||
| Diff against target: |
326 lines (+102/-39) 8 files modified
.bzrignore (+2/-5) gulpfile.js (+13/-17) package.json (+1/-1) tarmac_verify.sh (+2/-2) test/index.html (+3/-3) test/visual/config/large.js (+38/-2) test/visual/config/small.js (+43/-0) test/visual/config/smallscreen.js (+0/-9) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~stephen-stewart/ulysses/fix-jenkins-testing | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Czyżykowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Use casperjs/phantomcss directly
Description of the change
Use casperjs/phantomcss directly rather than through a third party plugin, which gives us control of phantomjs version and solves a number of issues.
Casperjs error state will now be passed to gulp and any failing tests should exit correctly.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM