Cmcmahon has submitted this change and it was merged.

Change subject: Moved Ruby code that multiple repositories use to 
mediawiki_selenium Ruby gem
......................................................................


Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem

Bug: 56088
Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)

Approvals:
  Jhall: Looks good to me, but someone else must approve
  Cmcmahon: Looks good to me, approved



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
     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)
-    net-http-persistent (2.9.3)
+    net-http-persistent (2.9.4)
     page-object (0.9.6)
       page_navigation (>= 0.9)
       selenium-webdriver (>= 2.39.0)
diff --git 
a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb 
b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
index dc467bf..4333101 100644
--- a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
+++ b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
@@ -3,10 +3,6 @@
   on(LightboxDemoPage).image1_in_article_element.should be_visible
 end
 
-Given(/^I am logged in$/) do
-  visit(LoginPage).login_with(ENV["MEDIAWIKI_USER"], ENV["MEDIAWIKI_PASSWORD"])
-end
-
 When(/^I click on the first image in the article$/) do
   on(LightboxDemoPage) do |page|
     page.image1_in_article
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 1dd1856..0000000
--- 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 6a22f2a..0000000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class LoginPage
-  include PageObject
-
-  include URL
-  page_url URL.url("Special:UserLogin")
-
-  button(:login, id: "wpLoginAttempt")
-  text_field(:password, id: "wpPassword1")
-  text_field(:username, id: "wpName1")
-
-  def logged_in_as_element
-    @browser.div(id: "mw-content-text").p.b
-  end
-  def login_with(username, password)
-    self.username_element.when_present.send_keys(username)
-    self.password_element.when_present.send_keys(password)
-    login_element.fire_event("onfocus")
-    login_element.when_present.click
-  end
-end
-
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org>
Gerrit-Reviewer: Jhall <jh...@wikimedia.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to