WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/354634 )

Change subject: Fix Ruby Selenium tests
......................................................................

Fix Ruby Selenium tests

Ruby Selenium tests where completly removed from core. This patch puts
the files needed into the extension's tests folder.

Change-Id: Iad9dfece6083f7907824a995edaa93ac4ad02457
---
M tests/browser/features/support/env.rb
A tests/browser/features/support/pages/edit_page.rb
A tests/browser/features/support/pages/ztargetpage.rb
A 
tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
A tests/browser/features/support/step_definitions/edit_page_steps.rb
5 files changed, 64 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/34/354634/1

diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index d754621..60d9870 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -2,5 +2,3 @@
 require 'mediawiki_selenium/cucumber'
 require 'mediawiki_selenium/pages'
 require 'mediawiki_selenium/step_definitions'
-require_all File.dirname(__FILE__) + 
'/../../../../../../tests/browser/features/support/pages'
-require_all File.dirname(__FILE__) + 
'/../../../../../../tests/browser/features/step_definitions'
diff --git a/tests/browser/features/support/pages/edit_page.rb 
b/tests/browser/features/support/pages/edit_page.rb
new file mode 100644
index 0000000..89ccf1b
--- /dev/null
+++ b/tests/browser/features/support/pages/edit_page.rb
@@ -0,0 +1,8 @@
+class EditPage
+  include PageObject
+
+  text_area(:edit_page_content, id: 'wpTextbox1')
+  button(:preview_button, css: '#wpPreview > input')
+  button(:show_changes_button, css: '#wpDiff > input')
+  button(:save_button, css: '#wpSave > input')
+end
diff --git a/tests/browser/features/support/pages/ztargetpage.rb 
b/tests/browser/features/support/pages/ztargetpage.rb
new file mode 100644
index 0000000..da789e5
--- /dev/null
+++ b/tests/browser/features/support/pages/ztargetpage.rb
@@ -0,0 +1,7 @@
+class ZtargetPage < MainPage
+  include PageObject
+
+  page_url '<%=params[:article_name]%>'
+
+  a(:link_target_page_link, text: 'link to the test target page')
+end
diff --git 
a/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
 
b/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
new file mode 100644
index 0000000..504d345
--- /dev/null
+++ 
b/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
@@ -0,0 +1,26 @@
+Given(/^I go to the "(.+)" page with content "(.+)"$/) do |page_title, 
page_content|
+  @wikitext = 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 })
+end
+
+Given(/^I create page "(.*?)" with content "(.*?)"$/) do |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
+  expect(@browser.url).to match /Link_Target_Test_Page/
+end
+
+Then(/^the page content should contain "(.*?)"$/) do |content|
+  expect(on(ZtargetPage).page_content).to match content
+end
diff --git a/tests/browser/features/support/step_definitions/edit_page_steps.rb 
b/tests/browser/features/support/step_definitions/edit_page_steps.rb
new file mode 100644
index 0000000..0e0aeb1
--- /dev/null
+++ b/tests/browser/features/support/step_definitions/edit_page_steps.rb
@@ -0,0 +1,23 @@
+When(/^I click Edit$/) do
+  on(MainPage).edit_link
+end
+
+When(/^I click Preview$/) do
+  on(EditPage).preview_button
+end
+
+When(/^I click Show Changes$/) do
+  on(EditPage).show_changes_button
+end
+
+When(/^I edit the page with "(.*?)"$/) do |edit_content|
+  on(EditPage).edit_page_content_element.send_keys(edit_content + 
@random_string)
+end
+
+When(/^I save the edit$/) do
+  on(EditPage).save_button
+end
+
+Then(/^the edited page content should contain "(.*?)"$/) do |content|
+  expect(on(MainPage).page_content).to match(content + @random_string)
+end

-- 
To view, visit https://gerrit.wikimedia.org/r/354634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9dfece6083f7907824a995edaa93ac4ad02457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to