Dduvall has submitted this change and it was merged.
Change subject: Method for loading of default environment
......................................................................
Method for loading of default environment
Change-Id: I0f6427c9e032da2ab58a40328711a8dd6c33562a
---
M lib/mediawiki_selenium/environment.rb
M lib/mediawiki_selenium/support/env.rb
M spec/environment_spec.rb
3 files changed, 22 insertions(+), 1 deletion(-)
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/environment.rb
b/lib/mediawiki_selenium/environment.rb
index afe4b91..61e38fd 100644
--- a/lib/mediawiki_selenium/environment.rb
+++ b/lib/mediawiki_selenium/environment.rb
@@ -36,6 +36,17 @@
new(*configs)
end
+
+ # Instantiates a new environment from the values of `ENV` and the
+ # default configuration corresponding to `ENV["MEDIAWIKI_ENVIRONMENT"]`,
+ # if one is defined.
+ #
+ # @see load
+ #
+ def load_default
+ load(ENV["MEDIAWIKI_ENVIRONMENT"], ENV)
+ end
+
end
self.default_configuration = "environments.yml"
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 1040ebc..c0d6559 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -18,7 +18,7 @@
require "mediawiki_selenium/support/modules/sauce_helper"
require "mediawiki_selenium/support/modules/strict_pending"
-World { MediawikiSelenium::Environment.load(ENV["MEDIAWIKI_ENVIRONMENT"], ENV)
}
+World { MediawikiSelenium::Environment.load_default }
World(MediawikiSelenium::ApiHelper)
World(MediawikiSelenium::PageFactory)
diff --git a/spec/environment_spec.rb b/spec/environment_spec.rb
index 40cdc81..6aead9b 100644
--- a/spec/environment_spec.rb
+++ b/spec/environment_spec.rb
@@ -61,6 +61,16 @@
end
end
+ describe ".load_default" do
+ subject { Environment.load_default }
+
+ it "loads the environment configuration specified by
MEDIAWIKI_ENVIRONMENT" do
+ expect(ENV).to
receive(:[]).with("MEDIAWIKI_ENVIRONMENT").and_return("foo")
+ expect(Environment).to receive(:load).with("foo", ENV)
+ subject
+ end
+ end
+
describe "#==" do
subject { env == other }
--
To view, visit https://gerrit.wikimedia.org/r/179375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f6427c9e032da2ab58a40328711a8dd6c33562a
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
