From 0638296fb3fdcb863ebe027237170e6bfabf86b4 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 15 Nov 2018 14:31:22 -0800 Subject: [PATCH] QA: Remove hacks introduced for T170890 These no longer seem to be achieving their original intention and may even be causing the flakiness we experience now. Additional changes: * Disable some more tests in Firefox job Bug: T208808 Change-Id: I735ec0ff293cfd7aa60519c080a300bd40dc0abc --- tests/browser/features/pageactions_protected.feature | 2 +- .../features/step_definitions/common_article_steps.rb | 8 +------- tests/browser/features/watchstar.feature | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/browser/features/pageactions_protected.feature b/tests/browser/features/pageactions_protected.feature index ac46d02..f44c4dd 100644 --- a/tests/browser/features/pageactions_protected.feature +++ b/tests/browser/features/pageactions_protected.feature @@ -1,4 +1,4 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @adminuser +@chrome @en.m.wikipedia.beta.wmflabs.org @adminuser Feature: Page actions menu when anonymous Background: diff --git a/tests/browser/features/step_definitions/common_article_steps.rb b/tests/browser/features/step_definitions/common_article_steps.rb index 5f1fa5c..3e400e3 100644 --- a/tests/browser/features/step_definitions/common_article_steps.rb +++ b/tests/browser/features/step_definitions/common_article_steps.rb @@ -27,13 +27,7 @@ When(/^I click the watch star$/) do end Then(/^I should see a toast notification$/) do - # To avoid flakey tests check the notification area element first (T170890) - on(ArticlePage) do |page| - # Minerva loads mediawiki.notify at startup which defers the loading of this module - # We must wait until the lazy loading has happened before checking for the toast (T170890) - page.wait_until_rl_module_ready('mediawiki.notification') - expect(page.notification_area_element.when_present).to be_visible - end + expect(on(ArticlePage).notification_area_element.when_present).to be_visible end Then(/^I should see a toast with message "(.+)"$/) do |msg| diff --git a/tests/browser/features/watchstar.feature b/tests/browser/features/watchstar.feature index f319633..c54e9e0 100644 --- a/tests/browser/features/watchstar.feature +++ b/tests/browser/features/watchstar.feature @@ -1,4 +1,4 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @integration @smoke @test2.m.wikipedia.org @login @vagrant +@chrome @en.m.wikipedia.beta.wmflabs.org @integration @smoke @test2.m.wikipedia.org @login @vagrant Feature: Manage Watchlist Background: