summaryrefslogtreecommitdiff
path: root/tests/browser/features/support
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 07:31:04 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 07:58:39 +0200
commitf6d65e533c62f6deb21342d4901ece24497b433e (patch)
treef28adf0362d14bcd448f7b65a7aaf38650f923aa /tests/browser/features/support
parentc27b2e832fe25651ef2410fae85b41072aae7519 (diff)
Update to MediaWiki 1.25.1
Diffstat (limited to 'tests/browser/features/support')
-rw-r--r--tests/browser/features/support/env.rb6
-rw-r--r--tests/browser/features/support/modules/url_module.rb10
-rw-r--r--tests/browser/features/support/pages/create_account_page.rb5
-rw-r--r--tests/browser/features/support/pages/edit_page.rb10
-rw-r--r--tests/browser/features/support/pages/file_does_not_exist_page.rb5
-rw-r--r--tests/browser/features/support/pages/login_error_page.rb4
-rw-r--r--tests/browser/features/support/pages/main_page.rb23
-rw-r--r--tests/browser/features/support/pages/preferences_appearance_page.rb46
-rw-r--r--tests/browser/features/support/pages/preferences_editing_page.rb23
-rw-r--r--tests/browser/features/support/pages/preferences_page.rb11
-rw-r--r--tests/browser/features/support/pages/preferences_user_profile_page.rb23
-rw-r--r--tests/browser/features/support/pages/view_history_page.rb3
-rw-r--r--tests/browser/features/support/pages/ztargetpage.rb8
13 files changed, 80 insertions, 97 deletions
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