diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 03:41:28 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 03:41:28 +0200 |
commit | 928ccf49fb5c6deb405358ad38221b0cd205fb6b (patch) | |
tree | db5b4921eed3fe8193dbcaeb07cefb7e6c714c34 /js/tests | |
parent | 90584316b8f275fcad904b644676544eb0322636 (diff) |
periodically update
Diffstat (limited to 'js/tests')
-rw-r--r-- | js/tests/e2e/main.js | 9 | ||||
-rw-r--r-- | js/tests/unit/controller/ItemControllerSpec.js (renamed from js/tests/unit/controller/AllItemsControllerSpec.js) | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/js/tests/e2e/main.js b/js/tests/e2e/main.js index 328556326..5b0ea5d82 100644 --- a/js/tests/e2e/main.js +++ b/js/tests/e2e/main.js @@ -23,14 +23,15 @@ describe('news page', function () { it('should show the first run page', function () { - var firstRun, - greeting; + var firstRun; + firstRun = browser.findElement(By.id('first-run')); - greeting = firstRun.findElement(By.tagName('h1')); + firstRun.findElement(By.tagName('h1')).then(function (greeting) { + expect(greeting.getText()).toBe('Welcome to the ownCloud News app!'); + }); expect(firstRun.isDisplayed()).toBe(true); - expect(greeting.getText()).toBe('Welcome to the ownCloud News app!'); }); });
\ No newline at end of file diff --git a/js/tests/unit/controller/AllItemsControllerSpec.js b/js/tests/unit/controller/ItemControllerSpec.js index 74292e628..cf0eb0d4d 100644 --- a/js/tests/unit/controller/AllItemsControllerSpec.js +++ b/js/tests/unit/controller/ItemControllerSpec.js @@ -7,7 +7,7 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @copyright Bernhard Posselt 2014 */ -describe('AllItemsController', function () { +describe('ItemController', function () { 'use strict'; var controller; |