Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197980
Change subject: Fallback to default environment configuration
......................................................................
Fallback to default environment configuration
Support truly works-out-of-the-box behavior for looking for a
"default" entry in `environments.yml` when none is explicitly given via
`MEDIAWIKI_ENVIRONMENT`.
Change-Id: I9392ee50b2cdc3f94fef361aae816ac0fab73fa5
---
M lib/mediawiki_selenium/environment.rb
M spec/environment_spec.rb
M templates/tests/browser/environments.yml
3 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/80/197980/1
diff --git a/lib/mediawiki_selenium/environment.rb
b/lib/mediawiki_selenium/environment.rb
index 75f64b3..412268d 100644
--- a/lib/mediawiki_selenium/environment.rb
+++ b/lib/mediawiki_selenium/environment.rb
@@ -85,7 +85,7 @@
# @see load
#
def load_default
- load(ENV['MEDIAWIKI_ENVIRONMENT'], ENV)
+ load(ENV['MEDIAWIKI_ENVIRONMENT'] || 'default', ENV)
end
end
diff --git a/spec/environment_spec.rb b/spec/environment_spec.rb
index a04caa1..a03d44e 100644
--- a/spec/environment_spec.rb
+++ b/spec/environment_spec.rb
@@ -69,6 +69,14 @@
expect(Environment).to receive(:load).with('foo', ENV)
subject
end
+
+ context 'where MEDIAWIKI_ENVIRONMENT is not defined' do
+ it 'looks for a "default" environment' do
+ expect(ENV).to
receive(:[]).with('MEDIAWIKI_ENVIRONMENT').and_return(nil)
+ expect(Environment).to receive(:load).with('default', ENV)
+ subject
+ end
+ end
end
describe '#==' do
diff --git a/templates/tests/browser/environments.yml
b/templates/tests/browser/environments.yml
index 8f8381e..b2232e6 100644
--- a/templates/tests/browser/environments.yml
+++ b/templates/tests/browser/environments.yml
@@ -14,7 +14,7 @@
# export MEDIAWIKI_USER=Selenium_user2
# bundle exec cucumber
#
-mw-vagrant-host:
+mw-vagrant-host: &default
mediawiki_url: http://127.0.0.1:8080/wiki/
mediawiki_user: Selenium_user
mediawiki_password: vagrant
@@ -33,3 +33,5 @@
mediawiki_url: http://test2.wikipedia.org/wiki/
mediawiki_user: Selenium_user
# mediawiki_password: SET THIS IN THE ENVIRONMENT!
+
+default: *default
--
To view, visit https://gerrit.wikimedia.org/r/197980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9392ee50b2cdc3f94fef361aae816ac0fab73fa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
