diff options
Diffstat (limited to 'tests/browser')
29 files changed, 188 insertions, 297 deletions
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock deleted file mode 100644 index 1ea4eb55..00000000 --- a/tests/browser/Gemfile.lock +++ /dev/null @@ -1,82 +0,0 @@ -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.20) - unf (>= 0.0.5, < 1.0.0) - faker (1.4.3) - 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.2.1) - faraday (~> 0.9, >= 0.9.0) - faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (0.3.2) - cucumber (~> 1.3, >= 1.3.10) - headless (~> 1.0, >= 1.0.1) - json (~> 1.8, >= 1.8.1) - mediawiki_api (~> 0.2, >= 0.2.1) - 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_api - mediawiki_selenium diff --git a/tests/browser/environment_variables b/tests/browser/environment_variables deleted file mode 100644 index 25c45775..00000000 --- a/tests/browser/environment_variables +++ /dev/null @@ -1,5 +0,0 @@ -export MEDIAWIKI_URL=http://localhost/wiki/ -export MEDIAWIKI_API_URL=http://localhost/w/api.php -export MEDIAWIKI_USER=Selenium_user -export MEDIAWIKI_PASSWORD=Selenium_password -export BROWSER=firefox diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml new file mode 100644 index 00000000..8f8381ed --- /dev/null +++ b/tests/browser/environments.yml @@ -0,0 +1,35 @@ +# Customize this configuration as necessary to provide defaults for various +# test environments. +# +# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT +# environment variable. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# bundle exec cucumber +# +# Additional variables set by the environment will override the corresponding +# defaults defined here. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# export MEDIAWIKI_USER=Selenium_user2 +# bundle exec cucumber +# +mw-vagrant-host: + mediawiki_url: http://127.0.0.1:8080/wiki/ + mediawiki_user: Selenium_user + mediawiki_password: vagrant + +mw-vagrant-guest: + mediawiki_url: http://127.0.0.1/wiki/ + mediawiki_user: Selenium_user + mediawiki_password: vagrant + +beta: + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +test2: + mediawiki_url: http://test2.wikipedia.org/wiki/ + mediawiki_user: Selenium_user + # mediawiki_password: SET THIS IN THE ENVIRONMENT! diff --git a/tests/browser/features/file.feature b/tests/browser/features/file.feature index 0bd36ed6..35a6675d 100644 --- a/tests/browser/features/file.feature +++ b/tests/browser/features/file.feature @@ -1,14 +1,3 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# @chrome @clean @firefox @internet_explorer_6 @internet_explorer_7 @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @phantomjs Feature: File diff --git a/tests/browser/features/login.feature b/tests/browser/features/login.feature index c34d23d3..2cb63564 100644 --- a/tests/browser/features/login.feature +++ b/tests/browser/features/login.feature @@ -1,14 +1,3 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# @chrome @clean @firefox @internet_explorer_6 @internet_explorer_7 @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @phantomjs Feature: Log in diff --git a/tests/browser/features/preferences.feature b/tests/browser/features/preferences.feature index 9e3abfde..9fed9cf4 100644 --- a/tests/browser/features/preferences.feature +++ b/tests/browser/features/preferences.feature @@ -1,14 +1,3 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# @chrome @clean @firefox @internet_explorer_6 @internet_explorer_7 @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @login @phantomjs Feature: Preferences diff --git a/tests/browser/features/step_definitions/create_account_steps.rb b/tests/browser/features/step_definitions/create_account_steps.rb index 7fa29843..03bff66f 100644 --- a/tests/browser/features/step_definitions/create_account_steps.rb +++ b/tests/browser/features/step_definitions/create_account_steps.rb @@ -10,9 +10,9 @@ # https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS # Given(/^I go to Create account page at (.+)$/) do |path| - visit(CreateAccountPage, :using_params => {:page_title => path}) + visit(CreateAccountPage, using_params: { page_title: path }) end Then(/^form has Create account button$/) do - on(CreateAccountPage).create_account_element.should exist + expect(on(CreateAccountPage).create_account_element).to exist end diff --git a/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb b/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb index ba41f7fb..504d3454 100644 --- a/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb +++ b/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb @@ -1,28 +1,26 @@ Given(/^I go to the "(.+)" page with content "(.+)"$/) do |page_title, page_content| @wikitext = page_content - on(APIPage).create page_title, page_content + api.create_page page_title, page_content step "I am on the #{page_title} page" end Given(/^I am on the (.+) page$/) do |article| article = article.gsub(/ /, '_') - visit(ZtargetPage, :using_params => {:article_name => article}) + visit(ZtargetPage, using_params: { article_name: article }) end Given(/^I create page "(.*?)" with content "(.*?)"$/) do |page_title, page_content| - on(APIPage).create page_title, page_content + api.create_page page_title, page_content end - When(/^I click the Link Target link$/) do on(ZtargetPage).link_target_page_link end Then(/^I should be on the Link Target Test Page$/) do - @browser.url.should match /Link_Target_Test_Page/ + expect(@browser.url).to match /Link_Target_Test_Page/ end Then(/^the page content should contain "(.*?)"$/) do |content| - on(ZtargetPage).page_content.should match content + expect(on(ZtargetPage).page_content).to match content end - diff --git a/tests/browser/features/step_definitions/edit_page_steps.rb b/tests/browser/features/step_definitions/edit_page_steps.rb index 5ab02bec..0e0aeb17 100644 --- a/tests/browser/features/step_definitions/edit_page_steps.rb +++ b/tests/browser/features/step_definitions/edit_page_steps.rb @@ -19,6 +19,5 @@ When(/^I save the edit$/) do end Then(/^the edited page content should contain "(.*?)"$/) do |content| - on(MainPage).page_content.should match(content + @random_string) + expect(on(MainPage).page_content).to match(content + @random_string) end - diff --git a/tests/browser/features/step_definitions/file_steps.rb b/tests/browser/features/step_definitions/file_steps.rb index a2ed1bfc..a80ca504 100644 --- a/tests/browser/features/step_definitions/file_steps.rb +++ b/tests/browser/features/step_definitions/file_steps.rb @@ -10,9 +10,9 @@ # https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS # Given(/^I am at file that does not exist$/) do - visit(FileDoesNotExistPage, using_params: {page_name: @random_string}) + visit(FileDoesNotExistPage, using_params: { page_name: @random_string }) end Then(/^page should show that no such file exists$/) do - on(FileDoesNotExistPage).file_does_not_exist_message_element.should be_visible + expect(on(FileDoesNotExistPage).file_does_not_exist_message_element).to be_visible end diff --git a/tests/browser/features/step_definitions/login_steps.rb b/tests/browser/features/step_definitions/login_steps.rb index b654b2d3..bff5bddd 100644 --- a/tests/browser/features/step_definitions/login_steps.rb +++ b/tests/browser/features/step_definitions/login_steps.rb @@ -14,52 +14,52 @@ Given(/^I am at Log in page$/) do end When(/^I log in with incorrect password$/) do - on(LoginPage).login_with(ENV["MEDIAWIKI_USER"], "incorrect password", false) + on(LoginPage).login_with(user, 'incorrect password', false) end When(/^I log in with incorrect username$/) do - on(LoginPage).login_with("incorrect username", ENV["MEDIAWIKI_PASSWORD"], false) + on(LoginPage).login_with('incorrect username', password, false) end When(/^I log in without entering credentials$/) do - on(LoginPage).login_with("", "", false) + on(LoginPage).login_with('', '', false) end When(/^I log in without entering password$/) do - on(LoginPage).login_with(ENV["MEDIAWIKI_USER"], "", false) + on(LoginPage).login_with(user, '', false) end Then(/^error box should be visible$/) do - on(LoginErrorPage).error_box_element.should be_visible + expect(on(LoginErrorPage).error_box_element).to be_visible end Then(/^error box should not be visible$/) do - on(LoginErrorPage).error_box_element.should_not be_visible + expect(on(LoginErrorPage).error_box_element).not_to be_visible end Then(/^feedback should be (.+)$/) do |feedback| on(LoginPage) do |page| page.feedback_element.when_present.click - page.feedback.should match Regexp.escape(feedback) + expect(page.feedback).to match Regexp.escape(feedback) end end Then(/^Log in element should be there$/) do - on(LoginPage).login_element.should exist + expect(on(LoginPage).login_element).to exist end Then(/^main page should open$/) do - @browser.url.should == on(MainPage).class.url + expect(@browser.url).to eq on(MainPage).class.url end Then(/^Password element should be there$/) do - on(LoginPage).password_element.should exist + expect(on(LoginPage).password_element).to exist end Then(/^there should be a link to (.+)$/) do |text| - on(LoginPage).username_displayed_element.when_present.text.should == text + expect(on(LoginPage).username_displayed_element.when_present.text).to eq text end Then(/^Username element should be there$/) do - on(LoginPage).username_element.should exist + expect(on(LoginPage).username_element).to exist end diff --git a/tests/browser/features/step_definitions/main_page_links_steps.rb b/tests/browser/features/step_definitions/main_page_links_steps.rb index c76fd2ba..7f588c05 100644 --- a/tests/browser/features/step_definitions/main_page_links_steps.rb +++ b/tests/browser/features/step_definitions/main_page_links_steps.rb @@ -3,45 +3,45 @@ Given(/^I open the main wiki URL$/) do end Then(/^I should see a link for View History$/) do - on(MainPage).view_history_link_element.should be_visible + expect(on(MainPage).view_history_link_element).to be_visible end Then(/^I should see a link for Edit$/) do - on(MainPage).edit_link_element.should be_visible + expect(on(MainPage).edit_link_element).to be_visible end Then(/^I should see a link for Recent changes$/) do - on(MainPage).recent_changes_link_element.should be_visible + expect(on(MainPage).recent_changes_link_element).to be_visible end Then(/^I should see a link for Random page$/) do - on(MainPage).random_page_link_element.should be_visible + expect(on(MainPage).random_page_link_element).to be_visible end Then(/^I should see a link for Help$/) do - on(MainPage).help_link_element.should be_visible + expect(on(MainPage).help_link_element).to be_visible end Then(/^I should see a link for What links here$/) do - on(MainPage).what_links_here_link_element.should be_visible + expect(on(MainPage).what_links_here_link_element).to be_visible end Then(/^I should see a link for Related changes$/) do - on(MainPage).related_changes_link_element.should be_visible + expect(on(MainPage).related_changes_link_element).to be_visible end Then(/^I should see a link for Special pages$/) do - on(MainPage).special_pages_link_element.should be_visible + expect(on(MainPage).special_pages_link_element).to be_visible end Then(/^I should see a link for Printable version$/) do - on(MainPage).printable_version_link_element.should be_visible + expect(on(MainPage).printable_version_link_element).to be_visible end Then(/^I should see a link for Permanent link$/) do - on(MainPage).permanent_link_link_element.should be_visible + expect(on(MainPage).permanent_link_link_element).to be_visible end Then(/^I should see a link for Page information$/) do - on(MainPage).page_information_link_element.should be_visible + expect(on(MainPage).page_information_link_element).to be_visible end diff --git a/tests/browser/features/step_definitions/preferences_appearance_steps.rb b/tests/browser/features/step_definitions/preferences_appearance_steps.rb index 0046af69..133eec3b 100644 --- a/tests/browser/features/step_definitions/preferences_appearance_steps.rb +++ b/tests/browser/features/step_definitions/preferences_appearance_steps.rb @@ -18,68 +18,66 @@ When(/^I navigate to Preferences$/) do end Then(/^I can click Save$/) do - on(PreferencesPage).save_button_element.should exist + expect(on(PreferencesPage).save_button_element).to exist end Then(/^I can restore default settings$/) do - on(PreferencesAppearancePage).restore_default_link_element.should exist + expect(on(PreferencesAppearancePage).restore_default_link_element).to exist end Then(/^I can see local time$/) do - on(PreferencesAppearancePage).local_time_span_element.should exist + expect(on(PreferencesAppearancePage).local_time_span_element).to exist end Then(/^I can see time offset section$/) do - on(PreferencesAppearancePage).time_offset_table_element.should be_visible + expect(on(PreferencesAppearancePage).time_offset_table_element).to be_visible end Then(/^I can select date format$/) do on(PreferencesAppearancePage) do |page| - page.no_preference_radio_element.should exist - page.mo_day_year_radio_element.should exist - page.day_mo_year_radio_element.should exist - page.year_mo_day_radio_element.should exist - page.iso_8601_radio_element.should exist + expect(page.no_preference_radio_element).to exist + expect(page.mo_day_year_radio_element).to exist + expect(page.day_mo_year_radio_element).to exist + expect(page.year_mo_day_radio_element).to exist + expect(page.iso_8601_radio_element).to exist end end Then(/^I can select image size$/) do - on(PreferencesAppearancePage).size_select_element.should exist + expect(on(PreferencesAppearancePage).size_select_element).to exist end Then(/^I can select my time zone$/) do on(PreferencesAppearancePage) do |page| - page.time_offset_select_element.should exist - page.other_offset_element.should exist + expect(page.time_offset_select_element).to exist + expect(page.other_offset_element).to exist end end Then(/^I can select skins$/) do on(PreferencesAppearancePage) do |page| - page.cologne_blue_element.should exist - page.modern_element.should exist - page.monobook_element.should exist - page.vector_element.should exist + expect(page.cologne_blue_element).to exist + expect(page.modern_element).to exist + expect(page.monobook_element).to exist + expect(page.vector_element).to exist end end Then(/^I can select Threshold for stub link$/) do - on(PreferencesAppearancePage).threshold_select_element.should exist + expect(on(PreferencesAppearancePage).threshold_select_element).to exist end Then(/^I can select thumbnail size$/) do - on(PreferencesAppearancePage).thumb_select_element.should exist + expect(on(PreferencesAppearancePage).thumb_select_element).to exist end Then(/^I can select underline preferences$/) do - on(PreferencesAppearancePage).underline_select_element.should exist + expect(on(PreferencesAppearancePage).underline_select_element).to exist end Then(/^I have advanced options checkboxes$/) do on(PreferencesAppearancePage) do |page| - page.hidden_categories_check_element.should exist - page.auto_number_check_element.should exist + expect(page.hidden_categories_check_element).to exist + expect(page.auto_number_check_element).to exist end end - - diff --git a/tests/browser/features/step_definitions/preferences_editing_steps.rb b/tests/browser/features/step_definitions/preferences_editing_steps.rb index ad29a745..0a98e889 100644 --- a/tests/browser/features/step_definitions/preferences_editing_steps.rb +++ b/tests/browser/features/step_definitions/preferences_editing_steps.rb @@ -14,41 +14,41 @@ When(/^I click Editing$/) do end Then(/^I can select edit area font style$/) do - on(PreferencesEditingPage).edit_area_font_style_select_element.when_present.should exist + expect(on(PreferencesEditingPage).edit_area_font_style_select_element.when_present).to exist end Then(/^I can select live preview$/) do - on(PreferencesEditingPage).live_preview_check_element.when_present.should exist + expect(on(PreferencesEditingPage).live_preview_check_element.when_present).to exist end Then(/^I can select section editing by double clicking$/) do - on(PreferencesEditingPage).edit_section_double_click_check_element.when_present.should exist + expect(on(PreferencesEditingPage).edit_section_double_click_check_element.when_present).to exist end Then(/^I can select section editing by right clicking$/) do - on(PreferencesEditingPage).edit_section_right_click_check_element.when_present.should exist + expect(on(PreferencesEditingPage).edit_section_right_click_check_element.when_present).to exist end Then(/^I can select section editing via edit links$/) do - on(PreferencesEditingPage).edit_section_edit_link_element.when_present.should exist + expect(on(PreferencesEditingPage).edit_section_edit_link_element.when_present).to exist end Then(/^I can select show edit toolbar$/) do - on(PreferencesEditingPage).show_edit_toolbar_check_element.when_present.should exist + expect(on(PreferencesEditingPage).show_edit_toolbar_check_element.when_present).to exist end Then(/^I can select show preview before edit box$/) do - on(PreferencesEditingPage).preview_on_top_check_element.when_present.should exist + expect(on(PreferencesEditingPage).preview_on_top_check_element.when_present).to exist end Then(/^I can select show preview on first edit$/) do - on(PreferencesEditingPage).preview_on_first_check_element.when_present.should exist + expect(on(PreferencesEditingPage).preview_on_first_check_element.when_present).to exist end Then(/^I can select to prompt me when entering a blank edit summary$/) do - on(PreferencesEditingPage).forced_edit_summary_check_element.when_present.should exist + expect(on(PreferencesEditingPage).forced_edit_summary_check_element.when_present).to exist end Then(/^I can select to warn me when I leave an edit page with unsaved changes$/) do - on(PreferencesEditingPage).unsaved_changes_check_element.when_present.should exist + expect(on(PreferencesEditingPage).unsaved_changes_check_element.when_present).to exist end diff --git a/tests/browser/features/step_definitions/preferences_user_profile_steps.rb b/tests/browser/features/step_definitions/preferences_user_profile_steps.rb index 529af66d..9c65db83 100644 --- a/tests/browser/features/step_definitions/preferences_user_profile_steps.rb +++ b/tests/browser/features/step_definitions/preferences_user_profile_steps.rb @@ -15,29 +15,28 @@ end Then(/^I can change my gender$/) do on(PreferencesUserProfilePage) do |page| - page.gender_undefined_radio_element.should exist - page.gender_male_radio_element.should exist - page.gender_female_radio_element.should exist + expect(page.gender_undefined_radio_element).to exist + expect(page.gender_male_radio_element).to exist + expect(page.gender_female_radio_element).to exist end end Then(/^I can change my language$/) do - on(PreferencesUserProfilePage).lang_select_element.should exist + expect(on(PreferencesUserProfilePage).lang_select_element).to exist end Then(/^I can change my signature$/) do - on(PreferencesUserProfilePage).signature_field_element.should exist + expect(on(PreferencesUserProfilePage).signature_field_element).to exist end Then(/^I can see my Basic informations$/) do - on(PreferencesUserProfilePage).basic_info_table_element.should exist + expect(on(PreferencesUserProfilePage).basic_info_table_element).to exist end Then(/^I can see my email$/) do - on(PreferencesUserProfilePage).email_table_element.should exist + expect(on(PreferencesUserProfilePage).email_table_element).to exist end Then(/^I can see my signature$/) do - on(PreferencesUserProfilePage).signature_table_element.should exist + expect(on(PreferencesUserProfilePage).signature_table_element).to exist end - diff --git a/tests/browser/features/step_definitions/view_history_steps.rb b/tests/browser/features/step_definitions/view_history_steps.rb index 1ecc0085..d9b93817 100644 --- a/tests/browser/features/step_definitions/view_history_steps.rb +++ b/tests/browser/features/step_definitions/view_history_steps.rb @@ -3,6 +3,5 @@ When(/^I click View History$/) do end Then(/^I should see a link to a previous version of the page$/) do - on(ViewHistoryPage).old_version_link_element.should be_visible + expect(on(ViewHistoryPage).old_version_link_element).to be_visible end - diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 7c122366..5eff4ce5 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,2 +1,4 @@ -require "mediawiki_api" -require "mediawiki_selenium" +require 'mediawiki_selenium' + +require 'mediawiki_selenium/support' +require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/modules/url_module.rb b/tests/browser/features/support/modules/url_module.rb deleted file mode 100644 index 6c329e87..00000000 --- a/tests/browser/features/support/modules/url_module.rb +++ /dev/null @@ -1,10 +0,0 @@ -module URL - def self.url(name) - if ENV["MEDIAWIKI_URL"] - mediawiki_url = ENV["MEDIAWIKI_URL"] - else - mediawiki_url = "http://127.0.0.1:80/w/index.php" - end - "#{mediawiki_url}#{name}" - end -end diff --git a/tests/browser/features/support/pages/create_account_page.rb b/tests/browser/features/support/pages/create_account_page.rb index 380bccbc..98b893a6 100644 --- a/tests/browser/features/support/pages/create_account_page.rb +++ b/tests/browser/features/support/pages/create_account_page.rb @@ -12,8 +12,7 @@ class CreateAccountPage include PageObject - include URL - page_url URL.url("<%=params[:page_title]%>") + page_url '<%=params[:page_title]%>' - button(:create_account, id: "wpCreateaccount") + button(:create_account, id: 'wpCreateaccount') end diff --git a/tests/browser/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb index b619c342..b0f6bffe 100644 --- a/tests/browser/features/support/pages/edit_page.rb +++ b/tests/browser/features/support/pages/edit_page.rb @@ -1,8 +1,8 @@ class EditPage include PageObject - text_area(:edit_page_content, id: "wpTextbox1") - button(:preview_button, id: "wpPreview") - button(:show_changes_button, id: "wpDiff") - button(:save_button, id: "wpSave") -end
\ No newline at end of file + text_area(:edit_page_content, id: 'wpTextbox1') + button(:preview_button, id: 'wpPreview') + button(:show_changes_button, id: 'wpDiff') + button(:save_button, id: 'wpSave') +end diff --git a/tests/browser/features/support/pages/file_does_not_exist_page.rb b/tests/browser/features/support/pages/file_does_not_exist_page.rb index c8491f3b..90762d22 100644 --- a/tests/browser/features/support/pages/file_does_not_exist_page.rb +++ b/tests/browser/features/support/pages/file_does_not_exist_page.rb @@ -12,8 +12,7 @@ class FileDoesNotExistPage include PageObject - include URL - page_url URL.url("File:<%=params[:page_name]%>") + page_url 'File:<%=params[:page_name]%>' - div(:file_does_not_exist_message, id: "mw-imagepage-nofile") + div(:file_does_not_exist_message, id: 'mw-imagepage-nofile') end diff --git a/tests/browser/features/support/pages/login_error_page.rb b/tests/browser/features/support/pages/login_error_page.rb index 4fc9ca7f..9a1805f3 100644 --- a/tests/browser/features/support/pages/login_error_page.rb +++ b/tests/browser/features/support/pages/login_error_page.rb @@ -1,5 +1,5 @@ class LoginErrorPage include PageObject - div(:error_box, class: "errorbox") -end
\ No newline at end of file + div(:error_box, class: 'errorbox') +end diff --git a/tests/browser/features/support/pages/main_page.rb b/tests/browser/features/support/pages/main_page.rb index 7d96c2b2..6d76b01c 100644 --- a/tests/browser/features/support/pages/main_page.rb +++ b/tests/browser/features/support/pages/main_page.rb @@ -1,19 +1,18 @@ class MainPage include PageObject - include URL - page_url URL.url("") + page_url '' a(:edit_link, href: /action=edit/) - li(:help_link, id: "n-help") - div(:page_content, id: "content") - li(:page_information_link, id: "t-info") - li(:permanent_link_link, id: "t-permalink") + li(:help_link, id: 'n-help') + div(:page_content, id: 'content') + li(:page_information_link, id: 't-info') + li(:permanent_link_link, id: 't-permalink') a(:printable_version_link, href: /printable=yes/) - li(:random_page_link, id: "n-randompage") - li(:recent_changes_link, id: "n-recentchanges") - li(:related_changes_link, id: "t-recentchangeslinked") - li(:special_pages_link, id: "t-specialpages") + li(:random_page_link, id: 'n-randompage') + li(:recent_changes_link, id: 'n-recentchanges') + li(:related_changes_link, id: 't-recentchangeslinked') + li(:special_pages_link, id: 't-specialpages') a(:view_history_link, href: /action=history/) - li(:what_links_here_link, id: "t-whatlinkshere") -end
\ No newline at end of file + li(:what_links_here_link, id: 't-whatlinkshere') +end diff --git a/tests/browser/features/support/pages/preferences_appearance_page.rb b/tests/browser/features/support/pages/preferences_appearance_page.rb index c24e3862..83c3952f 100644 --- a/tests/browser/features/support/pages/preferences_appearance_page.rb +++ b/tests/browser/features/support/pages/preferences_appearance_page.rb @@ -12,30 +12,28 @@ class PreferencesAppearancePage include PageObject - include URL - page_url URL.url("Special:Preferences#mw-prefsection-rendering") + page_url 'Special:Preferences#mw-prefsection-rendering' - checkbox(:auto_number_check, id: "mw-input-wpnumberheadings") - radio_button(:cologne_blue, id: "mw-input-wpskin-cologneblue") - radio_button(:day_mo_year_radio, id: "mw-input-wpdate-dmy") - checkbox(:dont_show_aft_check, id: "mw-input-wparticlefeedback-disable") - checkbox(:exclude_from_experiments_check, id: "mw-input-wpvector-noexperiments") - checkbox(:hidden_categories_check, id: "mw-input-wpshowhiddencats") - radio_button(:iso_8601_radio, id: "mw-input-wpdate-ISO_8601") - span(:local_time_span, id: "wpLocalTime") - radio_button(:mo_day_year_radio, id: "mw-input-wpdate-mdy") - radio_button(:modern, id: "mw-input-wpskin-modern") - radio_button(:monobook, id: "mw-input-wpskin-monobook") - radio_button(:no_preference_radio, id: "mw-input-wpdate-default") - text_field(:other_offset, id: "mw-input-wptimecorrection-other") + checkbox(:auto_number_check, id: 'mw-input-wpnumberheadings') + radio_button(:cologne_blue, id: 'mw-input-wpskin-cologneblue') + radio_button(:day_mo_year_radio, id: 'mw-input-wpdate-dmy') + checkbox(:dont_show_aft_check, id: 'mw-input-wparticlefeedback-disable') + checkbox(:exclude_from_experiments_check, id: 'mw-input-wpvector-noexperiments') + checkbox(:hidden_categories_check, id: 'mw-input-wpshowhiddencats') + radio_button(:iso_8601_radio, id: 'mw-input-wpdate-ISO_8601') + span(:local_time_span, id: 'wpLocalTime') + radio_button(:mo_day_year_radio, id: 'mw-input-wpdate-mdy') + radio_button(:modern, id: 'mw-input-wpskin-modern') + radio_button(:monobook, id: 'mw-input-wpskin-monobook') + radio_button(:no_preference_radio, id: 'mw-input-wpdate-default') + text_field(:other_offset, id: 'mw-input-wptimecorrection-other') a(:restore_default_link, href: /reset/) - select_list(:size_select, id: "mw-input-wpimagesize") - select_list(:threshold_select, id: "mw-input-wpstubthreshold") - select_list(:time_offset_select, id: "mw-input-wptimecorrection") - table(:time_offset_table, id: "mw-htmlform-timeoffset") - select_list(:thumb_select, id: "mw-input-wpthumbsize") - select_list(:underline_select, id: "mw-input-wpunderline") - radio_button(:vector, id: "mw-input-wpskin-vector") - radio_button(:year_mo_day_radio, id: "mw-input-wpdate-ymd") + select_list(:size_select, id: 'mw-input-wpimagesize') + select_list(:threshold_select, id: 'mw-input-wpstubthreshold') + select_list(:time_offset_select, id: 'mw-input-wptimecorrection') + table(:time_offset_table, id: 'mw-htmlform-timeoffset') + select_list(:thumb_select, id: 'mw-input-wpthumbsize') + select_list(:underline_select, id: 'mw-input-wpunderline') + radio_button(:vector, id: 'mw-input-wpskin-vector') + radio_button(:year_mo_day_radio, id: 'mw-input-wpdate-ymd') end - diff --git a/tests/browser/features/support/pages/preferences_editing_page.rb b/tests/browser/features/support/pages/preferences_editing_page.rb index aed9c41d..25c384f7 100644 --- a/tests/browser/features/support/pages/preferences_editing_page.rb +++ b/tests/browser/features/support/pages/preferences_editing_page.rb @@ -12,17 +12,16 @@ class PreferencesEditingPage include PageObject - include URL - page_url URL.url("Special:Preferences#mw-prefsection-rendering") + page_url 'Special:Preferences#mw-prefsection-rendering' - select_list(:edit_area_font_style_select, id: "mw-input-wpeditfont") - checkbox(:edit_section_double_click_check, id: "mw-input-wpeditondblclick") - checkbox(:edit_section_edit_link, id: "mw-input-wpeditsectiononrightclick") - checkbox(:edit_section_right_click_check, id: "mw-input-wpeditsectiononrightclick") - checkbox(:forced_edit_summary_check, id: "mw-input-wpforceeditsummary") - checkbox(:live_preview_check, id: "mw-input-wpuselivepreview") - checkbox(:preview_on_first_check, id: "mw-input-wppreviewonfirst") - checkbox(:preview_on_top_check, id: "mw-input-wppreviewontop") - checkbox(:show_edit_toolbar_check, id: "mw-input-wpshowtoolbar") - checkbox(:unsaved_changes_check, id: "mw-input-wpuseeditwarning") + select_list(:edit_area_font_style_select, id: 'mw-input-wpeditfont') + checkbox(:edit_section_double_click_check, id: 'mw-input-wpeditondblclick') + checkbox(:edit_section_edit_link, id: 'mw-input-wpeditsectiononrightclick') + checkbox(:edit_section_right_click_check, id: 'mw-input-wpeditsectiononrightclick') + checkbox(:forced_edit_summary_check, id: 'mw-input-wpforceeditsummary') + checkbox(:live_preview_check, id: 'mw-input-wpuselivepreview') + checkbox(:preview_on_first_check, id: 'mw-input-wppreviewonfirst') + checkbox(:preview_on_top_check, id: 'mw-input-wppreviewontop') + checkbox(:show_edit_toolbar_check, id: 'mw-input-wpshowtoolbar') + checkbox(:unsaved_changes_check, id: 'mw-input-wpuseeditwarning') end diff --git a/tests/browser/features/support/pages/preferences_page.rb b/tests/browser/features/support/pages/preferences_page.rb index 919ba27f..b305ee2c 100644 --- a/tests/browser/features/support/pages/preferences_page.rb +++ b/tests/browser/features/support/pages/preferences_page.rb @@ -12,11 +12,10 @@ class PreferencesPage include PageObject - include URL - page_url URL.url("Special:Preferences") + page_url 'Special:Preferences' - a(:appearance_link, id: "preftab-rendering") - a(:editing_link, id: "preftab-editing") - a(:user_profile_link, id: "preftab-personal") - button(:save_button, id: "prefcontrol") + a(:appearance_link, id: 'preftab-rendering') + a(:editing_link, id: 'preftab-editing') + a(:user_profile_link, id: 'preftab-personal') + button(:save_button, id: 'prefcontrol') end diff --git a/tests/browser/features/support/pages/preferences_user_profile_page.rb b/tests/browser/features/support/pages/preferences_user_profile_page.rb index 28e10b97..9e95eb5a 100644 --- a/tests/browser/features/support/pages/preferences_user_profile_page.rb +++ b/tests/browser/features/support/pages/preferences_user_profile_page.rb @@ -12,17 +12,16 @@ class PreferencesUserProfilePage include PageObject - include URL - page_url URL.url("Special:Preferences#mw-prefsection-personal") + page_url 'Special:Preferences#mw-prefsection-personal' - table(:basic_info_table, id: "mw-htmlform-info") - link(:change_password_link, text: "Change password") - table(:email_table, id: "mw-htmlform-email") - radio_button(:gender_female_radio, id: "mw-input-wpgender-male") - radio_button(:gender_male_radio, id: "mw-input-wpgender-female") - radio_button(:gender_undefined_radio, id: "mw-input-wpgender-unknown") - select_list(:lang_select, id: "mw-input-wplanguage") - checkbox(:remember_password_check, id: "mw-input-wprememberpassword") - text_field(:signature_field, id: "mw-input-wpnickname") - table(:signature_table, id: "mw-htmlform-signature") + table(:basic_info_table, id: 'mw-htmlform-info') + link(:change_password_link, text: 'Change password') + table(:email_table, id: 'mw-htmlform-email') + radio_button(:gender_female_radio, id: 'mw-input-wpgender-male') + radio_button(:gender_male_radio, id: 'mw-input-wpgender-female') + radio_button(:gender_undefined_radio, id: 'mw-input-wpgender-unknown') + select_list(:lang_select, id: 'mw-input-wplanguage') + checkbox(:remember_password_check, id: 'mw-input-wprememberpassword') + text_field(:signature_field, id: 'mw-input-wpnickname') + table(:signature_table, id: 'mw-htmlform-signature') end diff --git a/tests/browser/features/support/pages/view_history_page.rb b/tests/browser/features/support/pages/view_history_page.rb index 66895986..bb9c5862 100644 --- a/tests/browser/features/support/pages/view_history_page.rb +++ b/tests/browser/features/support/pages/view_history_page.rb @@ -3,5 +3,4 @@ class ViewHistoryPage a(:view_history_link, href: /action=history/) a(:old_version_link, href: /oldid=/) - -end
\ No newline at end of file +end diff --git a/tests/browser/features/support/pages/ztargetpage.rb b/tests/browser/features/support/pages/ztargetpage.rb index c1f46eca..da789e5e 100644 --- a/tests/browser/features/support/pages/ztargetpage.rb +++ b/tests/browser/features/support/pages/ztargetpage.rb @@ -1,7 +1,7 @@ class ZtargetPage < MainPage - include URL - page_url URL.url("<%=params[:article_name]%>") include PageObject - a(:link_target_page_link, text: "link to the test target page") -end
\ No newline at end of file + page_url '<%=params[:article_name]%>' + + a(:link_target_page_link, text: 'link to the test target page') +end |