jenkins-bot has submitted this change and it was merged. Change subject: User sees call to action after registration ......................................................................
User sees call to action after registration See also commits in mediawiki/selenium[1], jenkins-job-builder-config[2] and zuul-config[3]. 1: https://gerrit.wikimedia.org/r/#/c/144978/ 2: https://gerrit.wikimedia.org/r/#/c/150172/ 3: https://gerrit.wikimedia.org/r/#/c/152795/ Paired with: Chris McMahon Paired with: Sam Smith Bug: 63172 Change-Id: I79d9468e56bc7941c7c5bb27a77d1622bc7d3836 --- A tests/browser/Gemfile A tests/browser/Gemfile.lock A tests/browser/README.md A tests/browser/features/modal_on_editable_returnto.feature A tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb A tests/browser/features/support/env.rb A tests/browser/features/support/pages/editable_return_to_page.rb 7 files changed, 138 insertions(+), 0 deletions(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile new file mode 100755 index 0000000..37f6e96 --- /dev/null +++ b/tests/browser/Gemfile @@ -0,0 +1,6 @@ +#ruby=ruby-2.1.2 +#ruby-gemset=GettingStarted + +source "https://rubygems.org"; + +gem "mediawiki_selenium" diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock new file mode 100644 index 0000000..04c303d --- /dev/null +++ b/tests/browser/Gemfile.lock @@ -0,0 +1,81 @@ +GEM + remote: https://rubygems.org/ + specs: + builder (3.2.2) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + cucumber (1.3.16) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.1) + data_magic (0.19) + faker (>= 1.1.2) + yml_reader (>= 0.3) + diff-lcs (1.2.5) + domain_name (0.5.19) + unf (>= 0.0.5, < 1.0.0) + faker (1.4.2) + i18n (~> 0.5) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + ffi (1.9.3) + gherkin (2.12.2) + multi_json (~> 1.3) + headless (1.0.2) + http-cookie (1.0.2) + domain_name (~> 0.5) + i18n (0.6.11) + json (1.8.1) + mediawiki_api (0.1.4) + faraday (~> 0.9, >= 0.9.0) + faraday-cookie_jar (~> 0.0, >= 0.0.6) + mediawiki_selenium (0.2.26) + cucumber (~> 1.3, >= 1.3.10) + headless (~> 1.0, >= 1.0.1) + json (~> 1.8, >= 1.8.1) + mediawiki_api (~> 0.1.3) + page-object (~> 1.0) + rest-client (~> 1.6, >= 1.6.7) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) + mime-types (2.3) + multi_json (1.10.1) + multi_test (0.1.1) + multipart-post (2.0.0) + netrc (0.7.7) + page-object (1.0.2) + page_navigation (>= 0.9) + selenium-webdriver (>= 2.42.0) + watir-webdriver (>= 0.6.9) + page_navigation (0.9) + data_magic (>= 0.14) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-expectations (2.99.2) + diff-lcs (>= 1.1.3, < 2.0) + rubyzip (1.1.6) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0.4) + syntax (1.2.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.6) + watir-webdriver (0.6.10) + selenium-webdriver (>= 2.18.0) + websocket (1.0.7) + yml_reader (0.3) + +PLATFORMS + ruby + +DEPENDENCIES + mediawiki_selenium diff --git a/tests/browser/README.md b/tests/browser/README.md new file mode 100644 index 0000000..98534f8 --- /dev/null +++ b/tests/browser/README.md @@ -0,0 +1,5 @@ +# Browser tests + +Run the tests with `bundle exec cucumber`. + +See <http://git.wikimedia.org/markdown/mediawiki%2Fselenium.git/HEAD/README.md> for instructions on how to configure your development environment for running the tests. diff --git a/tests/browser/features/modal_on_editable_returnto.feature b/tests/browser/features/modal_on_editable_returnto.feature new file mode 100644 index 0000000..17927c2 --- /dev/null +++ b/tests/browser/features/modal_on_editable_returnto.feature @@ -0,0 +1,10 @@ [email protected] @firefox +Feature: Modal on editable returnto page + + Scenario: User sees modal call to action after registration + Given I have just registered + And I have been returned to an editable page + Then I should see a modal call to action + And one action is edit this page + And one action is edit a suggested page + And one action is no thanks, maybe later diff --git a/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb new file mode 100644 index 0000000..c0413bc --- /dev/null +++ b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb @@ -0,0 +1,23 @@ +Given(/^I have just registered$/) do + visit(LoginPage).login_with(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"]) +end + +Given(/^I have been returned to an editable page$/) do + visit(EditableReturnToPage) +end + +Then(/^I should see a modal call to action$/) do + expect(on(EditableReturnToPage).cta_element.when_present).to be_visible +end + +Then(/^one action is edit this page$/) do + expect(on(EditableReturnToPage).edit_this_page_element).to be_visible +end + +Then(/^one action is edit a suggested page$/) do + expect(on(EditableReturnToPage).edit_suggested_page_element).to be_visible +end + +Then(/^one action is no thanks, maybe later$/) do + expect(on(EditableReturnToPage).no_thanks_element).to be_visible +end diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb new file mode 100644 index 0000000..8ac08ea --- /dev/null +++ b/tests/browser/features/support/env.rb @@ -0,0 +1 @@ +require "mediawiki_selenium" diff --git a/tests/browser/features/support/pages/editable_return_to_page.rb b/tests/browser/features/support/pages/editable_return_to_page.rb new file mode 100644 index 0000000..28b3538 --- /dev/null +++ b/tests/browser/features/support/pages/editable_return_to_page.rb @@ -0,0 +1,12 @@ +class EditableReturnToPage + include PageObject + + include URL + page_url URL.url("Special:Random?gettingStartedReturn=true") + + h1(:title, id: "firstHeading") + div(:cta, id: "mw-gettingstarted-cta-editable-main-page") + a(:edit_this_page, id: "mw-gettingstarted-editable-main-edit-page") + a(:edit_suggested_page, id: "mw-gettingstarted-editable-main-fix-pages") + a(:no_thanks, class: "mw-gettingstarted-cta-leave-link") +end -- To view, visit https://gerrit.wikimedia.org/r/123873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79d9468e56bc7941c7c5bb27a77d1622bc7d3836 Gerrit-PatchSet: 17 Gerrit-Project: mediawiki/extensions/GettingStarted Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> Gerrit-Reviewer: Cmcmahon <[email protected]> Gerrit-Reviewer: Mattflaschen <[email protected]> Gerrit-Reviewer: Phuedx <[email protected]> Gerrit-Reviewer: Robmoen <[email protected]> Gerrit-Reviewer: Swalling <[email protected]> Gerrit-Reviewer: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
