Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2752 from shane-tomlinson/issue_2751_default_browser

Define a sauce-platforms.defaultPlatform variable, set it to vista_firefox_16
  • Loading branch information...
commit 33645d53e417bfe6a702e42cdde8689ef2e20846 2 parents d5f0db3 + ce7b5a8
@lloyd lloyd authored
View
1  automation-tests/config/sauce-platforms.js
@@ -63,3 +63,4 @@ const defaultCapabilities = {
exports.platforms = platforms;
exports.defaultCapabilities = defaultCapabilities;
+exports.defaultPlatform = "vista_firefox_16";
View
6 automation-tests/scripts/run-all.js
@@ -14,6 +14,8 @@
* should be tested.
*/
+const sauce_platforms = require('../config/sauce-platforms');
+
const outputFormats = ["console", "json", "xunit"];
@@ -60,7 +62,7 @@ if (args.h) {
// optimist only runs "check" if an option is defined. Since we are checking if
// an option is not defined, its check has to be outside of the option.
if (!args.platform && !process.env.PERSONA_NO_SAUCE) {
- args.platform = process.env.PERSONA_BROWSER || "vista_chrome";
+ args.platform = process.env.PERSONA_BROWSER || sauce_platforms.defaultPlatform;
}
// all is a supported alias "match everything"
if (args.platform === 'all') args.platform = "*";
@@ -81,7 +83,7 @@ const path = require('path'),
vows_path = path.join(__dirname, "../node_modules/.bin/vows"),
vows_args = [(args.output === 'xunit') ? "--xunit" : "--json", "-i"],
result_extension = process.env.RESULT_EXTENSION || "xml",
- supported_platforms = require('../config/sauce-platforms').platforms,
+ supported_platforms = sauce_platforms.platforms,
start_time = new Date().getTime(),
glob = require('minimatch');
View
9 scripts/awsbox_local/post_create.js
@@ -4,9 +4,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const fs = require('fs'),
- temp = require('temp'),
- scp = require('./scp').scp;
+const fs = require('fs'),
+ temp = require('temp'),
+ scp = require('./scp').scp,
+ defaultPlatform = require('../../automation-tests/config/sauce-platforms').defaultPlatform;
function getFromEnv(name, defaultValue) {
var envValue = process.env[name];
@@ -29,7 +30,7 @@ function copyConfig(done) {
persona_sauce_user: getFromEnv("PERSONA_SAUCE_USER"),
persona_sauce_api_key: getFromEnv("PERSONA_SAUCE_APIKEY"),
persona_sauce_pass: getFromEnv("PERSONA_SAUCE_PASS"),
- persona_browser: getFromEnv("PERSONA_BROWSER", "vista_chrome"),
+ persona_browser: getFromEnv("PERSONA_BROWSER", defaultPlatform),
runners: parseInt(getFromEnv("RUNNERS", 30), 10)
};
Please sign in to comment.
Something went wrong with that request. Please try again.