Merge "QA: Adjustments to account for slow loading of mediawiki.notifications"

tests/browser/features/step_definitions/common_article_steps.rb

@@ -28,6 +28,11 @@ 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')
+  end
   expect(on(ArticlePage).notification_area_element.when_visible).to be_visible
   expect(on(ArticlePage).toast_element.when_visible).to be_visible
 end

tests/browser/features/support/pages/article_page.rb

@@ -145,7 +145,7 @@ class ArticlePage
 
   # toast
   div(:notification_area, id: 'mw-notification-area')
-  div(:toast, class: 'mw-notification')
+  div(:toast, css: '.mw-notification')
 
   # loader
   div(:content_wrapper, id: 'content')

tests/browser/features/watchstar.feature

@@ -7,7 +7,7 @@ Feature: Manage Watchlist
   Scenario: Add an article to the watchlist
     Given I am viewing an unwatched page
     When I click the watch star
-    Then I should see a toast with "Added Selenium mobile watch test to your watchlist"
+    Then I should see a toast with message "Added Selenium mobile watch test to your watchlist"
       And the watch star should be selected
 
   Scenario: Remove an article from the watchlist