X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fselenium%2Fspecs%2Frollback.js;h=ffe2a5714cee694fa34957b215045c4609820218;hb=1955a8aa5646c10bc3457a519c2a43b0b1dbb2ad;hp=22c05f404066081c17f19f3edaf14be0903261c0;hpb=63281bdc10e037d0722865e983b8dfdd10f405f0;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/selenium/specs/rollback.js b/tests/selenium/specs/rollback.js index 22c05f4040..ffe2a5714c 100644 --- a/tests/selenium/specs/rollback.js +++ b/tests/selenium/specs/rollback.js @@ -10,9 +10,9 @@ describe( 'Rollback with confirmation', function () { before( function () { // disable VisualEditor welcome dialog - browser.deleteCookie(); + browser.deleteAllCookies(); BlankPage.open(); - browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } ); + browser.setLocalStorage( 've-beta-welcome-dialog', '1' ); // Enable rollback confirmation for admin user // Requires user to log in again, handled by deleteCookie() call in beforeEach function @@ -21,7 +21,7 @@ describe( 'Rollback with confirmation', function () { } ); beforeEach( function () { - browser.deleteCookie(); + browser.deleteAllCookies(); content = Util.getTestString( 'beforeEach-content-' ); name = Util.getTestString( 'BeforeEach-name-' ); @@ -45,7 +45,7 @@ describe( 'Rollback with confirmation', function () { it.skip( 'should offer a way to cancel rollbacks', function () { HistoryPage.rollback.click(); - HistoryPage.rollbackConfirmableNo.waitForVisible( 5000 ); + HistoryPage.rollbackConfirmableNo.waitForDisplayed( 5000 ); HistoryPage.rollbackConfirmableNo.click(); @@ -57,7 +57,7 @@ describe( 'Rollback with confirmation', function () { it.skip( 'should perform rollbacks after confirming intention', function () { HistoryPage.rollback.click(); - HistoryPage.rollbackConfirmableYes.waitForVisible( 5000 ); + HistoryPage.rollbackConfirmableYes.waitForDisplayed( 5000 ); HistoryPage.rollbackConfirmableYes.click(); @@ -90,9 +90,9 @@ describe( 'Rollback without confirmation', function () { before( function () { // disable VisualEditor welcome dialog - browser.deleteCookie(); + browser.deleteAllCookies(); BlankPage.open(); - browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } ); + browser.setLocalStorage( 've-beta-welcome-dialog', '1' ); // Disable rollback confirmation for admin user // Requires user to log in again, handled by deleteCookie() call in beforeEach function @@ -101,7 +101,7 @@ describe( 'Rollback without confirmation', function () { } ); beforeEach( function () { - browser.deleteCookie(); + browser.deleteAllCookies(); content = Util.getTestString( 'beforeEach-content-' ); name = Util.getTestString( 'BeforeEach-name-' ); @@ -117,7 +117,7 @@ describe( 'Rollback without confirmation', function () { // waitUntil indirectly asserts that the content we are looking for is present browser.waitUntil( function () { - return HistoryPage.headingText === 'Action complete'; + return HistoryPage.heading.getText() === 'Action complete'; }, 5000, 'Expected rollback page to appear.' ); } );