Skip to content

Commit

Permalink
Merge 89f2175 into 9d87658
Browse files Browse the repository at this point in the history
  • Loading branch information
pomek committed Jun 6, 2019
2 parents 9d87658 + 89f2175 commit 1348315
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 76 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Expand Up @@ -14,8 +14,4 @@ before_install:
install:
- npm install
script:
- npm run coverage && npm t -- --browsers=Firefox,BrowserStack_Edge,BrowserStack_Safari
env:
global:
- secure: ZrY5vzp2m7fvi7JT2sxU4b5NIvOSdtvc6QrtflFyRkyiVbdHsu5ut4WuZYbVX+nStqGT3wHtQMrzCClM/nULbEmLICnlOjSWm905qooEB2Jt6ZEQBI5FQdjaxkXhPGZdNgWjz13KaHJR8NkFo2c9f2gnrc0DICWQFMz/ABzsQt4RJrFD26cl3ElwBS31UaRNoRwoOaZZZZ+gkgkei0I3lXJ2S5i/yijNWKYA7yGy1+J5ATZJBUc0uXA5EETqlmNnUEurOEzj1CK3iGuaZsK7LBxNN1Ba6HPVVB8MLXcv9S4ILuUTzKH//ym0l319Iutc/VYfxXNtzLgAtPxLke8S2ggBpP29qZJ37+BaKLS8dGl1QaZ+7fHJdsEin+ZhyJQkqx22EtUQ/OLla0Yg5++cnBDTdjbeuurVSwuFyeu0ChdepK1FqbF3ihUR8+4yKA4NPtAiNNMafsuGXu2CV4KhFdazab8PjVmI6nMCuq79/J0IzmRxV7NfwaoEdgiNmk72k/GIAGfUQ6RuwyEHHGZRcl3kL1o5vRJefVh78S7Poa81dhCdbhvgp7k5LJ1r0ACpdF16fOlfnRAfLNhNJM0Nspnyy/GESpk/pYGnqmNV1x2ytm8g5MhpvzFiGXQtx9yxPzMVyj4XALKCTomwdHcpwtQ2OSo28wg+1mGvem89Rvc=
- secure: TDrgvDyzz3me4jRp/mVX6gczMrOzUH0MGLmxlqMmtWMdm48hHuqOjz/xHo7yY2r0B0CXvej6QzGJ/iS8u4a7bFtyjMRKnJyrsHlJ1OJ1WaZSeQxSCf0O6C3SWftEvAoMx2kJuLHA6Z70JzrDSJstnM0gxItn1N3Am/pzHSsnrm1zdVTzHNRxUWeeb1T6XNA9h8JYNQHuGiveV+YyaqZ+6RChhvZylocvavFW5xNLwEJNavNuNhC6MxwFWMH9iOBqGJsNBLwQJ7oyo6FDsJB8Pi9QZuOze3VkedjTP6MOf8UpCTsITnV20yVr7l3ZV7CEQlSKn94HFX0FkvOaLF/gYFKZR2VeUlpnk1cHAg6OiD2RFAx757pQqD5DfFZHmftAaqBc783eDrehZrKMiWkWZoqqQq68ONCA5gKXVhyZG+pclR2HXBANYZ3ytQ1pQW64G2ExEilCw2bL+oI0tAcW9UGzEmdp/0+j/QW42PXHa3Ic4UH9+gzqVCxBX0en09kveNoG2LM8ZNM7Kp/NZLTHJ8R8JDBT0TbIJHxxmaKIOTQ8Ye2YRhucEGSKaq35/BKpwhqGfbNtX53C/Z+hxr0SF0m1Tm+sogNOD4ms/UWzTXF3czsIxzsNVMeCqs0YVhfJReqEQPUDfxcKJufl8hi4/N7QGBde5vBri+XNqbGOVco=
- npm run coverage && npm t -- --browsers=Firefox
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -3,7 +3,6 @@
[![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-vue.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-vue)
[![Build Status](https://travis-ci.org/ckeditor/ckeditor5-vue.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-vue)
[![BrowserStack Status](https://automate.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://automate.browserstack.com/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
[![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5-vue/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-vue?branch=master)
<br>
[![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-vue/status.svg)](https://david-dm.org/ckeditor/ckeditor5-vue)
Expand Down
1 change: 0 additions & 1 deletion package.json
Expand Up @@ -31,7 +31,6 @@
"eslint-config-ckeditor5": "^1.0.8",
"istanbul-instrumenter-loader": "^3.0.0",
"karma": "^4.0.0",
"karma-browserstack-launcher": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
Expand Down
75 changes: 6 additions & 69 deletions scripts/utils/getkarmaconfig.js
Expand Up @@ -71,18 +71,6 @@ module.exports = function getKarmaConfig() {
CHROME_LOCAL: {
base: 'Chrome',
flags: [ '--disable-background-timer-throttling' ]
},
BrowserStack_Edge: {
base: 'BrowserStack',
os: 'Windows',
os_version: '10',
browser: 'edge'
},
BrowserStack_Safari: {
base: 'BrowserStack',
os: 'OS X',
os_version: 'High Sierra',
browser: 'safari'
}
},

Expand All @@ -97,17 +85,6 @@ module.exports = function getKarmaConfig() {
}
};

if ( shouldEnableBrowserStack() ) {
karmaConfig.browserStack = {
username: process.env.BROWSER_STACK_USERNAME,
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
build: getBuildName(),
project: 'ckeditor5'
};

karmaConfig.reporters = [ 'dots', 'BrowserStack' ];
}

if ( options.watch ) {
karmaConfig.autoWatch = true;
karmaConfig.singleRun = false;
Expand Down Expand Up @@ -172,53 +149,13 @@ function getBrowsers( browsers ) {
return null;
}

const newBrowsers = browsers
.map( browser => {
if ( browser !== 'Chrome' ) {
return browser;
}

return process.env.TRAVIS ? 'CHROME_TRAVIS_CI' : 'CHROME_LOCAL';
} );

if ( shouldEnableBrowserStack() ) {
return newBrowsers;
}

// If the BrowserStack is disabled, all browsers that start with a prefix "BrowserStack" should be filtered out.
// See: https://github.com/ckeditor/ckeditor5-dev/issues/358 and https://github.com/ckeditor/ckeditor5-dev/issues/402.
return newBrowsers.filter( browser => !browser.startsWith( 'BrowserStack' ) );
}

// Formats name of the build for BrowserStack. It merges a repository name and current timestamp.
// If env variable `TRAVIS_REPO_SLUG` is not available, the function returns `undefined`.
//
// @returns {String|undefined}
function getBuildName() {
const repoSlug = process.env.TRAVIS_REPO_SLUG;

if ( !repoSlug ) {
return;
}

const repositoryName = repoSlug.split( '/' )[ 1 ].replace( /-/g, '_' );
const date = new Date().getTime();

return `${ repositoryName } ${ date }`;
}

function shouldEnableBrowserStack() {
if ( !process.env.BROWSER_STACK_USERNAME ) {
return false;
}

if ( !process.env.BROWSER_STACK_ACCESS_KEY ) {
return false;
}
return browsers.map( browser => {
if ( browser !== 'Chrome' ) {
return browser;
}

// If the repository slugs are different, the pull request comes from the community (forked repository).
// For such builds, BrowserStack will be disabled. Read more: https://github.com/ckeditor/ckeditor5-dev/issues/358.
return ( process.env.TRAVIS_EVENT_TYPE !== 'pull_request' || process.env.TRAVIS_PULL_REQUEST_SLUG === process.env.TRAVIS_REPO_SLUG );
return process.env.TRAVIS ? 'CHROME_TRAVIS_CI' : 'CHROME_LOCAL';
} );
}

/**
Expand Down

0 comments on commit 1348315

Please sign in to comment.