jenkins-bot has submitted this change and it was merged.
Change subject: Minor cruft removal
......................................................................
Minor cruft removal
Removed URL and SauceHelper modules as they're no longer needed.
Change-Id: I525ce51232758099889b2d4e0270a04ece511b38
---
M lib/mediawiki_selenium/support/env.rb
D lib/mediawiki_selenium/support/modules/sauce_helper.rb
D lib/mediawiki_selenium/support/modules/url_module.rb
3 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
Zfilipin: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index c0d6559..7c4f123 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -15,12 +15,10 @@
require "watir-webdriver"
require "mediawiki_selenium/support/modules/api_helper"
-require "mediawiki_selenium/support/modules/sauce_helper"
require "mediawiki_selenium/support/modules/strict_pending"
World { MediawikiSelenium::Environment.load_default }
World(MediawikiSelenium::ApiHelper)
World(MediawikiSelenium::PageFactory)
-World(MediawikiSelenium::SauceHelper)
World(MediawikiSelenium::StrictPending)
diff --git a/lib/mediawiki_selenium/support/modules/sauce_helper.rb
b/lib/mediawiki_selenium/support/modules/sauce_helper.rb
deleted file mode 100644
index 0cb9902..0000000
--- a/lib/mediawiki_selenium/support/modules/sauce_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module MediawikiSelenium
- module SauceHelper
- # The current Sauce session ID.
- #
- # @return [String]
- #
- def sauce_session_id
- @session_id ||=
@browser.driver.instance_variable_get(:@bridge).session_id if @browser
- rescue StandardError
- nil
- end
- end
-end
diff --git a/lib/mediawiki_selenium/support/modules/url_module.rb
b/lib/mediawiki_selenium/support/modules/url_module.rb
deleted file mode 100644
index d66d281..0000000
--- a/lib/mediawiki_selenium/support/modules/url_module.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-=begin
-This file is subject to the license terms in the LICENSE file found in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
-mediawiki_selenium, including this file, may be copied, modified, propagated,
or
-distributed except according to the terms contained in the LICENSE file.
-Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
-mediawiki_selenium top-level directory and at
-https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
-=end
-
-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
--
To view, visit https://gerrit.wikimedia.org/r/179376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I525ce51232758099889b2d4e0270a04ece511b38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: env-abstraction-layer
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
