jenkins-bot has submitted this change and it was merged.
Change subject: QA: update search test for RSpec
......................................................................
QA: update search test for RSpec
* also removed unused code marked FIXME
Change-Id: Icd2a70235e419dedc2c2848a4de7996a13d02567
---
M tests/browser/features/no_javascript_site.feature
M tests/browser/features/search.feature
M tests/browser/features/step_definitions/search_steps.rb
3 files changed, 14 insertions(+), 22 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/no_javascript_site.feature
b/tests/browser/features/no_javascript_site.feature
index ce097e4..6b29f5c 100644
--- a/tests/browser/features/no_javascript_site.feature
+++ b/tests/browser/features/no_javascript_site.feature
@@ -11,7 +11,7 @@
Scenario: Able to search in basic non-JavaScript site
When I click on "Random" in the main navigation menu
Then I should see the watch star
- And I see the search button
+ And I should see the search button
# FIXME: Check that the edit button is invisible
# FIXME: Check that the upload button is invisible
diff --git a/tests/browser/features/search.feature
b/tests/browser/features/search.feature
index 589a3cc..90fc0c7 100644
--- a/tests/browser/features/search.feature
+++ b/tests/browser/features/search.feature
@@ -7,29 +7,26 @@
And the page "Selenium search test" exists
When I click the placeholder search box
- Scenario: Opening search
- Then I see the search overlay
-
Scenario: Closing search (overlay button)
When I click the search overlay close button
- Then I don't see the search overlay
+ Then I should not see the search overlay
Scenario: Closing search (browser button)
When I click the browser back button
- Then I don't see the search overlay
+ Then I should not see the search overlay
Scenario: Search for partial text
When I type into search box "Selenium search tes"
Then search results should contain "Selenium search test"
Scenario: Search with search in pages button
- When I see the search overlay
+ And I see the search overlay
And I type into search box "Test is used by Selenium web driver"
And I click the search in pages button
Then I see a list of search results
Scenario: Search with enter key
- When I see the search overlay
+ And I see the search overlay
And I type into search box "Test is used by Selenium web driver"
And I press the enter key
Then I see a list of search results
diff --git a/tests/browser/features/step_definitions/search_steps.rb
b/tests/browser/features/step_definitions/search_steps.rb
index e88becc..3182cf8 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -27,6 +27,10 @@
on(ArticlePage).search_overlay_close_button_element.click
end
+When(/^I see the search overlay$/) do
+ on(ArticlePage).search_overlay_element.when_present
+end
+
When(/^I type into search box "(.+)"$/) do |search_term|
on(ArticlePage) do |page|
if page.search_box2_element.exists?
@@ -38,23 +42,14 @@
end
end
-# FIXME: Is there a way to merge this rule into "I type into search box"?
-When(/^I type into search placeholder box "(.+)"$/) do |search_term|
- on(ArticlePage).search_box_placeholder=search_term
+Then(/^I should not see the search overlay$/) do
+ expect(on(ArticlePage).search_overlay_element).not_to be_visible
end
-Then(/^I don't see the search overlay$/) do
- on(ArticlePage).search_overlay_element.should_not be_visible
-end
-
-Then(/^I see the search button$/) do
- on(ArticlePage).search_button_element.when_present.should be_visible
-end
-
-Then(/^I see the search overlay$/) do
- on(ArticlePage).search_overlay_element.should be_visible
+Then(/^I should see the search button$/) do
+ expect(on(ArticlePage).search_button_element.when_present).to be_visible
end
Then(/^search results should contain "(.+)"$/) do |text|
- on(ArticlePage).search_result_element.when_present.text.should == text
+ expect(on(ArticlePage).search_result_element.when_present.text).to eq text
end
--
To view, visit https://gerrit.wikimedia.org/r/177279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd2a70235e419dedc2c2848a4de7996a13d02567
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
