Fix ListView e2e tests

marmelab · May 18, 2015 · 93d932d · 93d932d
1 parent 8de0a91
commit 93d932d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/javascripts/test/e2e/ListViewSpec.js b/src/javascripts/test/e2e/ListViewSpec.js
@@ -2,36 +2,30 @@
 describe('ListView', function () {
     'use strict';
 
-    beforeEach(function() {
+    beforeEach(function () {
         browser.get(browser.baseUrl + '#/posts/list');
     });
 
     describe('Edition link', function () {
         it('should allow edition of an entity', function () {
             // Retrieve first edit button
-            $$('table tr:nth-child(1) a.btn').then(function (buttons) {
-                // Click on it
-                buttons[1].click().then(function() {
-                    // Check browser URL
-                    browser.getLocationAbsUrl().then(function(url) {
-                        expect(url).toContain('/posts/edit/');
-                    });
-                });
+            $('table tr:nth-child(1) ma-edit-button a span').click();
+
+            // Check browser URL
+            browser.getLocationAbsUrl().then(function(url) {
+                expect(url).toContain('/posts/edit/');
             });
         });
     });
 
     describe('Show link', function () {
         it('should allow display of an entity', function () {
-            // Retrieve first show button
-            $$('table tr:nth-child(1) a.btn').then(function (buttons) {
-                // Click on it
-                buttons[0].click().then(function() {
-                    // Check browser URL
-                    browser.getLocationAbsUrl().then(function(url) {
-                        expect(url).toContain('/posts/show/');
-                    });
-                });
+            // Retrieve first edit button
+            $('table tr:nth-child(1) ma-show-button a span').click();
+
+            // Check browser URL
+            browser.getLocationAbsUrl().then(function(url) {
+                expect(url).toContain('/posts/show/');
             });
         });
     });

diff --git a/src/javascripts/test/protractor.conf.js b/src/javascripts/test/protractor.conf.js
@@ -10,7 +10,8 @@ exports.config =  {
             browserName: 'chrome',
             build: process.env.TRAVIS_BUILD_NUMBER ? process.env.TRAVIS_BUILD_NUMBER : null,
             'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER ? process.env.TRAVIS_JOB_NUMBER : null,
-            name: 'ng-admin'
+            name: 'ng-admin',
+            screenResolution: '1280x1024'
         }
     ],