Skip to content

Commit

Permalink
chore(eol): normalize all the line endings
Browse files Browse the repository at this point in the history
add .gitattributes and set the default behavior, in case people do not have core.autocrlf set
  • Loading branch information
stevemao authored and juliemr committed Sep 29, 2014
1 parent 94240b2 commit 3ca4e9f
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 47 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
* text=auto
94 changes: 47 additions & 47 deletions spec/shardingConf.js
@@ -1,47 +1,47 @@
// A suite of tests to run on two browsers at once, splitting test files between
// the two instances of chrome.
var env = require('./environment.js');

exports.config = {
seleniumAddress: env.seleniumAddress,

// Spec patterns are relative to this directory.
specs: [
'basic/mock*',
'basic/lib_spec.js'
],

// Exclude patterns are relative to this directory.
exclude: [
'basic/exclude*.js'
],

chromeOnly: false,
framework: 'debugprint',
maxSessions: 3,
multiCapabilities: [{
'browserName': 'chrome',
maxInstances: 2
}, {
'browserName': 'chrome',
shardTestFiles: true,
maxInstances: 1,
specs: 'basic/polling*' // Capacity specific specs
}, {
shardTestFiles: true,
'browserName': 'firefox',
maxInstances: 2,
count: 2,
specs: 'basic/action*',
}],

baseUrl: env.baseUrl,

params: {
login: {
user: 'Jane',
password: '1234'
}
}
};
// A suite of tests to run on two browsers at once, splitting test files between
// the two instances of chrome.
var env = require('./environment.js');

exports.config = {
seleniumAddress: env.seleniumAddress,

// Spec patterns are relative to this directory.
specs: [
'basic/mock*',
'basic/lib_spec.js'
],

// Exclude patterns are relative to this directory.
exclude: [
'basic/exclude*.js'
],

chromeOnly: false,
framework: 'debugprint',
maxSessions: 3,
multiCapabilities: [{
'browserName': 'chrome',
maxInstances: 2
}, {
'browserName': 'chrome',
shardTestFiles: true,
maxInstances: 1,
specs: 'basic/polling*' // Capacity specific specs
}, {
shardTestFiles: true,
'browserName': 'firefox',
maxInstances: 2,
count: 2,
specs: 'basic/action*',
}],

baseUrl: env.baseUrl,

params: {
login: {
user: 'Jane',
password: '1234'
}
}
};

0 comments on commit 3ca4e9f

Please sign in to comment.