jenkins-bot has submitted this change and it was merged.
Change subject: QA: refactor references test for RSpec3
......................................................................
QA: refactor references test for RSpec3
* beginning of refactoring common_article_steps.rb, more to come
Change-Id: Ib4ae1b861ca30f5efbe6171d8ddb66c825427f2f
---
M Gemfile.lock
M tests/browser/features/references.feature
M tests/browser/features/step_definitions/common_article_steps.rb
M tests/browser/features/step_definitions/references_steps.rb
4 files changed, 14 insertions(+), 23 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gemfile.lock b/Gemfile.lock
index eebc47c..aac69cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,6 @@
faker (>= 1.1.2)
yml_reader (>= 0.4)
diff-lcs (1.2.5)
- dimensions (1.2.0)
domain_name (0.5.22)
unf (>= 0.0.5, < 1.0.0)
faker (1.4.3)
@@ -35,12 +34,6 @@
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.6.11)
- jsduck (5.3.4)
- dimensions (~> 1.2.0)
- json (~> 1.8.0)
- parallel (~> 0.7.1)
- rdiscount (~> 2.1.6)
- rkelly-remix (~> 0.0.4)
json (1.8.1)
mediawiki_api (0.3.0)
faraday (~> 0.9, >= 0.9.0)
@@ -65,17 +58,14 @@
watir-webdriver (>= 0.6.9)
page_navigation (0.9)
data_magic (>= 0.14)
- parallel (0.7.1)
parser (2.2.0.pre.7)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
powerpack (0.0.9)
rainbow (2.0.0)
- rdiscount (2.1.7.1)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- rkelly-remix (0.0.6)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rubocop (0.27.1)
@@ -106,6 +96,5 @@
DEPENDENCIES
chunky_png
- jsduck
mediawiki_selenium (~> 0.3.2)
rubocop
diff --git a/tests/browser/features/references.feature
b/tests/browser/features/references.feature
index 8f6754d..97f0b93 100644
--- a/tests/browser/features/references.feature
+++ b/tests/browser/features/references.feature
@@ -7,11 +7,10 @@
Scenario: Opening the reference drawer
Given I go to a page that has references
When I click on a reference
- Then I see the reference drawer
+ Then I should see the reference drawer
Scenario: Closing the reference drawer
Given I go to a page that has references
When I click on a reference
- And I see the reference drawer
And I click on the page
- Then I do not see the reference drawer
+ Then I should not see the reference drawer
diff --git a/tests/browser/features/step_definitions/common_article_steps.rb
b/tests/browser/features/step_definitions/common_article_steps.rb
index d275b06..753b907 100644
--- a/tests/browser/features/step_definitions/common_article_steps.rb
+++ b/tests/browser/features/step_definitions/common_article_steps.rb
@@ -29,16 +29,16 @@
on(ArticlePage).last_modified_bar_history_link_element.when_present.click
end
+When(/^I click on the page$/) do
+ on(ArticlePage).content_wrapper_element.click
+end
+
When(/^I click the unwatch star$/) do
on(ArticlePage).unwatch_link_element.when_present.click
end
When(/^I click the watch star$/) do
on(ArticlePage).watch_link_element.when_present.click
-end
-
-Then(/^I click on the page$/) do
- on(ArticlePage).content_wrapper_element.click
end
# Toast notifications
diff --git a/tests/browser/features/step_definitions/references_steps.rb
b/tests/browser/features/step_definitions/references_steps.rb
index c7e5aed..f28b94f 100644
--- a/tests/browser/features/step_definitions/references_steps.rb
+++ b/tests/browser/features/step_definitions/references_steps.rb
@@ -1,11 +1,14 @@
When(/^I click on a reference$/) do
- on(ArticlePage).reference_element.click
+ on(ArticlePage) do |page|
+ page.reference_element.click
+ page.reference_drawer_element.when_present
+ end
end
-Then(/^I see the reference drawer$/) do
- on(ArticlePage).reference_drawer_element.when_present.should be_visible
+Then(/^I should see the reference drawer$/) do
+ expect(on(ArticlePage).reference_drawer_element).to be_visible
end
-Then(/^I do not see the reference drawer$/) do
- on(ArticlePage).reference_drawer_element.when_not_present
+Then(/^I should not see the reference drawer$/) do
+ expect(on(ArticlePage).reference_drawer_element.when_not_present).to be_nil
end
--
To view, visit https://gerrit.wikimedia.org/r/176694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ae1b861ca30f5efbe6171d8ddb66c825427f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[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
