Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(tavis): fix karma config for browserstack #156

Merged
merged 5 commits into from
Jan 19, 2018
Merged

fix(tavis): fix karma config for browserstack #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
879d1e2
fix(tavis): fix karma config for browserstack
nnixaa Jan 19, 2018
33d39f3
fix(tavis): fix karma config for browserstack
nnixaa Jan 19, 2018
1b64428
fix(karma): rename browserstack key as it is reversed and used direct…
nnixaa Jan 19, 2018
53d69d3
fix(karma): rename browserstack key as it is reversed and used direct…
nnixaa Jan 19, 2018
e2d8813
fix(karma): rename browserstack key as it is reversed and used direct…
nnixaa Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
- SAUCE_USERNAME=nixa
- SAUCE_ACCESS_KEY=a922753805a4-7538-6644-c450-48fdf18c
- BROWSER_STACK_USERNAME=debac1
- BROWSER_STACK_ACCESS_KEY=V5ykpyxrTxXLSsRBmXpL
- BROWSER_STACK_KEY=V5ykpyxrTxXLSsRBmXpL
- BROWSER_PROVIDER_READY_FILE=/tmp/nebular/readyfile
- BROWSER_PROVIDER_ERROR_FILE=/tmp/nebular/errorfile
- LOGS_DIR=/tmp/nebular/logs
Expand All @@ -30,7 +30,6 @@ matrix:
allow_failures:
- env: "MODE=sauce_e2e"
- env: "MODE=sauce_unit_test"
- env: "MODE=browserstack_unit_test"

install:
- npm install
Expand Down
6 changes: 4 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ module.exports = function (config) {
BrowserstackChromeCI: {
base: 'BrowserStack',
browser: 'Chrome',
version: 'latest'
version: 'latest',
os: 'Windows',
os_version: '10'
}
},
browserConsoleLogOptions: {
Expand All @@ -70,7 +72,7 @@ module.exports = function (config) {
pollingTimeout: 20000,
video: false,
},
singleRun: false
singleRun: true
};

if (process.env['TRAVIS']) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/browserstack/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = process.env.BROWSER_STACK_ACCESS_KEY.split('').reverse().join('');
module.exports = process.env.BROWSER_STACK_KEY.split('').reverse().join('');
4 changes: 2 additions & 2 deletions scripts/ci/browserstack/start-tunnel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TUNNEL_URL="https://www.browserstack.com/browserstack-local/${TUNNEL_FILE}"
TUNNEL_DIR="/tmp/browserstack-tunnel"
TUNNEL_LOG="${LOGS_DIR}/browserstack-tunnel.log"

BROWSER_STACK_ACCESS_KEY=`echo ${BROWSER_STACK_ACCESS_KEY} | rev`
BROWSER_STACK_KEY=`echo ${BROWSER_STACK_KEY} | rev`

# Cleanup and create the folder structure for the tunnel connector.
rm -rf ${TUNNEL_DIR} ${BROWSER_PROVIDER_READY_FILE}
Expand Down Expand Up @@ -63,7 +63,7 @@ function create_ready_file {
touch ${BROWSER_PROVIDER_READY_FILE}
}

browserstack-tunnel/BrowserStackLocal -k ${BROWSER_STACK_ACCESS_KEY} ${ARGS} 2>&1 >> ${TUNNEL_LOG} &
browserstack-tunnel/BrowserStackLocal -k ${BROWSER_STACK_KEY} ${ARGS} 2>&1 >> ${TUNNEL_LOG} &

# Wait for the tunnel to be ready and create the readyfile with the Browserstack PID
create_ready_file &