jenkins-bot has submitted this change and it was merged.
Change subject: Move test password overrides to untracked file.
......................................................................
Move test password overrides to untracked file.
Change-Id: I830daba1dbc4c77473ab9e8d70db430da8527a30
---
M tests/browser/.gitignore
M tests/browser/README
M tests/browser/config/config.yml
M tests/browser/features/support/env.rb
4 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/.gitignore b/tests/browser/.gitignore
index 1af12b1..f24ff04 100644
--- a/tests/browser/.gitignore
+++ b/tests/browser/.gitignore
@@ -1,2 +1,3 @@
Gemfile.lock
reports/
+config/secret.yml
diff --git a/tests/browser/README b/tests/browser/README
index 08fec7b..9f68200 100644
--- a/tests/browser/README
+++ b/tests/browser/README
@@ -20,11 +20,12 @@
mediawiki directory:
php maintenance/createAndPromote.php --force --sysop Selenium_user selenium123
-You can override the password by creating /private/wmf/secret.yml in the
format:
- mediawiki_password: new_password
-or just changing it in config/config.yml. If you change it in config.yml
-remember not to push it.
-
+You can override the password by creating /private/wmf/secret.yml or
+config/secret.yml in the format:
+ mediawiki_username: Selenium_user
+ mediawiki_password: selenium123
+While you could technically just change config.yml that wouldn't be a good idea
+because it'd be too easy to accidentally commit your password.
Running
-------
diff --git a/tests/browser/config/config.yml b/tests/browser/config/config.yml
index f0fb67a..05cb3de 100644
--- a/tests/browser/config/config.yml
+++ b/tests/browser/config/config.yml
@@ -1,7 +1,5 @@
-# mediawiki_username: Selenium_user
-# mediawiki_password: selenium123
-mediawiki_username: NEverett (WMF)
-mediawiki_password: 'H/a=O>_10lYz'
+mediawiki_username: Selenium_user
+mediawiki_password: selenium123
android:
name: android
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index b1f2ef3..d91ed29 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -81,7 +81,7 @@
browser
end
def secret_yml_location
- secret_yml_locations = ['/private/wmf/secret.yml', 'config/config.yml']
+ secret_yml_locations = ['/private/wmf/secret.yml', 'config/secret.yml',
'config/config.yml']
secret_yml_locations.each do |secret_yml_location|
return secret_yml_location if File.exists?("#{secret_yml_location}")
end
@@ -96,9 +96,9 @@
end
config = YAML.load_file('config/config.yml')
-mediawiki_username = config['mediawiki_username']
secret = YAML.load_file("#{secret_yml_location}")
+mediawiki_username = secret['mediawiki_username']
mediawiki_password = secret['mediawiki_password']
if ENV['ENVIRONMENT'] == 'cloudbees'
--
To view, visit https://gerrit.wikimedia.org/r/78386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I830daba1dbc4c77473ab9e8d70db430da8527a30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Demon <[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
