diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index c23a2f61..b610d8d2 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -22,15 +22,15 @@ GEM headless (1.0.1) i18n (0.6.9) json (1.8.1) - mediawiki_selenium (0.2.0) - cucumber (~> 1.3.10) - headless (~> 1.0.1) - json (~> 1.8.1) - net-http-persistent (~> 2.9.1) - page-object (~> 0.9.5) - rest-client (~> 1.6.7) - rspec-expectations (~> 2.14.4) - syntax (~> 1.2.0) + mediawiki_selenium (0.2.2) + cucumber (~> 1.3, >= 1.3.10) + headless (~> 1.0, >= 1.0.1) + json (~> 1.8, >= 1.8.1) + net-http-persistent (~> 2.9, >= 2.9.1) + page-object (~> 0.9, >= 0.9.5) + rest-client (~> 1.6, >= 1.6.7) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) mime-types (2.1) multi_json (1.8.4) multi_test (0.0.3) diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index d5a85d9a..cb495ea1 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -5,10 +5,6 @@ end Given(/^I am logged out$/) do end -Given(/^I am logged in$/) do - visit(LoginPage).login_with(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"]) -end - Given(/^I set "(.*?)" as the interface language$/) do |language| code = on(PanelPage).language_to_code(language) visit(PanelPage, :using_params => {:extra => "setlang=#{code}"}) diff --git a/tests/browser/features/step_definitions/textarea_font_steps.rb b/tests/browser/features/step_definitions/textarea_font_steps.rb index 71c00115..2cc2115a 100644 --- a/tests/browser/features/step_definitions/textarea_font_steps.rb +++ b/tests/browser/features/step_definitions/textarea_font_steps.rb @@ -1,7 +1,3 @@ -Given(/^I have reset my preferences$/) do - visit(ResetPreferencesPage).submit_element.click -end - When(/^I set the editing fonts to "(.*?)"$/) do |editing_font| visit(PreferencesPage) do |page| page.editing_tab_element.click 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 1dd1856d..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://en.wikipedia.beta.wmflabs.org/wiki/" - end - "#{mediawiki_url}#{name}" - end -end diff --git a/tests/browser/features/support/pages/login_page.rb b/tests/browser/features/support/pages/login_page.rb deleted file mode 100644 index e4179e49..00000000 --- a/tests/browser/features/support/pages/login_page.rb +++ /dev/null @@ -1,23 +0,0 @@ -class LoginPage - include PageObject - - include URL - page_url URL.url("Special:UserLogin") - - div(:feedback, class: "errorbox") - button(:login, id: "wpLoginAttempt") - text_field(:password, id: "wpPassword1") - a(:password_strength, text: "password strength") - a(:phishing, text: "phishing") - text_field(:username, id: "wpName1") - a(:username_displayed, title: /Your user page/) - - def logged_in_as_element - @browser.div(id: "mw-content-text").p.b - end - def login_with(username, password) - self.username = username - self.password = password - login - end -end diff --git a/tests/browser/features/support/pages/reset_preferences_page.rb b/tests/browser/features/support/pages/reset_preferences_page.rb deleted file mode 100644 index 37c6726a..00000000 --- a/tests/browser/features/support/pages/reset_preferences_page.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ResetPreferencesPage - include PageObject - include URL - page_url URL.url("Special:Preferences/reset") - - button(:submit, class: "mw-htmlform-submit") -end