Merge "Fix RSpec::Expectations::ExpectationNotMetError in Selenium tests"

diff --git a/tests/browser/features/step_definitions/create_account_steps.rb b/tests/browser/features/step_definitions/create_account_steps.rb
index fa0570c..d9b4f52 100644 (file)
--- a/tests/browser/features/step_definitions/create_account_steps.rb
+++ b/tests/browser/features/step_definitions/create_account_steps.rb
@@ -11,5 +11,5 @@ When(/^I submit the form$/) do
 end
 
 Then(/^an error message is displayed$/) do
-  expect(on(CreateAccountPage).error_message_element.class_name).to eq 'errorbox'
+  expect(on(CreateAccountPage).error_message_element).to exist
 end

diff --git a/tests/browser/features/step_definitions/login_steps.rb b/tests/browser/features/step_definitions/login_steps.rb
index bda0faa..9b35e99 100644 (file)
--- a/tests/browser/features/step_definitions/login_steps.rb
+++ b/tests/browser/features/step_definitions/login_steps.rb
@@ -23,11 +23,11 @@ When(/^I log in without entering password$/) do
 end
 
 Then(/^error box should be visible$/) do
-  expect(on(LoginErrorPage).error_box_element).to be_visible
+  expect(on(LoginPage).error_message_element).to exist
 end
 
 Then(/^error box should not be visible$/) do
-  expect(on(LoginErrorPage).error_box_element).not_to be_visible
+  expect(on(LoginPage).error_message_element).not_to exist
 end
 
 Then(/^feedback should be (.+)$/) do |feedback|

diff --git a/tests/browser/features/support/pages/create_account_page.rb b/tests/browser/features/support/pages/create_account_page.rb
index 9c1c3ba..20e2744 100644 (file)
--- a/tests/browser/features/support/pages/create_account_page.rb
+++ b/tests/browser/features/support/pages/create_account_page.rb
@@ -4,5 +4,5 @@ class CreateAccountPage
   page_url '<%=params[:page_title]%>'
 
   button(:create_account, id: 'wpCreateaccount')
-  div(:error_message, id: 'mw-createacct-status-area')
+  element(:error_message, css: 'div#userloginForm div.error')
 end

diff --git a/tests/browser/features/support/pages/login_error_page.rb b/tests/browser/features/support/pages/login_error_page.rb
deleted file mode 100644 (file)
index 9a1805f..0000000
--- a/tests/browser/features/support/pages/login_error_page.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class LoginErrorPage
-  include PageObject
-
-  div(:error_box, class: 'errorbox')
-end

diff --git a/tests/browser/features/support/pages/login_page.rb b/tests/browser/features/support/pages/login_page.rb
index 8ef1e44..4727318 100644 (file)
--- a/tests/browser/features/support/pages/login_page.rb
+++ b/tests/browser/features/support/pages/login_page.rb
@@ -5,6 +5,7 @@ class LoginPage
 
   page_url 'Special:UserLogin'
 
+  element(:error_message, css: 'div#userloginForm div.error')
   div(:feedback, class: 'errorbox')
   button(:login, id: 'wpLoginAttempt')
   li(:logout, id: 'pt-logout')