diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2016-03-23 17:33:23 -0300 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2016-03-23 17:33:23 -0300 |
| commit | b67fe3688bd4a49f08714ac46f8230c23816dca7 (patch) | |
| tree | 191cb18badd7163e5c1e03041732509087da993b | |
| parent | 9c45cbe26d1034e251c5ee72510309e807f633d0 (diff) | |
Updated karma launcher so we use the same phantomjs
It is now on version 1.0.0, to support phantomjs2,
now we bumped the version of phantomjs to 2.1.1 in
all environments and for all the types of tests
| -rw-r--r-- | web-ui/package.json | 2 | ||||
| -rw-r--r-- | web-ui/test/spec/mail_view/ui/compose_box.spec.js | 2 | ||||
| -rw-r--r-- | web-ui/test/spec/page/logout.spec.js | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/web-ui/package.json b/web-ui/package.json index fae3fb19..652e7b0e 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -15,7 +15,7 @@ "karma-firefox-launcher": "0.1.7", "karma-jasmine": "0.2.2", "karma-junit-reporter": "0.2.2", - "karma-phantomjs-launcher": "0.1.4", + "karma-phantomjs-launcher": "1.0.0", "karma-requirejs": "0.2.2", "karma-coverage": "0.2.7", "minify": "^2.0.5", diff --git a/web-ui/test/spec/mail_view/ui/compose_box.spec.js b/web-ui/test/spec/mail_view/ui/compose_box.spec.js index 6d318815..26941156 100644 --- a/web-ui/test/spec/mail_view/ui/compose_box.spec.js +++ b/web-ui/test/spec/mail_view/ui/compose_box.spec.js @@ -137,7 +137,7 @@ describeComponent('mail_view/ui/compose_box', function () { }); it('should show the subject label after the user starts typing', function() { - input.val('test'); + input.text('test'); input.trigger('keyup'); expect(input.hasClass('showfloatlabel')).toEqual(true); diff --git a/web-ui/test/spec/page/logout.spec.js b/web-ui/test/spec/page/logout.spec.js index a8b882b0..49f8b5e5 100644 --- a/web-ui/test/spec/page/logout.spec.js +++ b/web-ui/test/spec/page/logout.spec.js @@ -16,7 +16,7 @@ describeComponent('page/logout', function () { var logout_form = this.component.$node.find('form')[0]; expect(logout_form).toExist(); expect(logout_form.action).toMatch('test/logout/url'); - expect(logout_form.method).toMatch('POST'); + expect(logout_form.method).toMatch('post'); }); it('should not provide logout form if logout is disabled', function () { @@ -75,4 +75,3 @@ describeComponent('page/logout', function () { }); }); - |