Skip to content

Commit

Permalink
Run legacy api functional tests on push (DevExpress#2332)
Browse files Browse the repository at this point in the history
  • Loading branch information
miherlosev authored and AndreyBelym committed Apr 20, 2018
1 parent f0a6a05 commit 6951198
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,8 @@ gulp.task('test-functional-local', ['build'], function () {
return testFunctional('test/functional/fixtures', functionalTestConfig.testingEnvironmentNames.localBrowsers);
});

gulp.task('test-functional-travis-legacy', ['build'], function () {
return testFunctional('test/functional/legacy-fixtures', functionalTestConfig.testingEnvironmentNames.legacy, functionalTestConfig.browserProviderNames.sauceLabs);
gulp.task('test-functional-local-legacy', ['build'], function () {
return testFunctional('test/functional/legacy-fixtures', functionalTestConfig.testingEnvironmentNames.legacy);
});

gulp.task('test-functional-travis-old-browsers', ['build'], function () {
Expand Down
30 changes: 23 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,32 @@ install:
choco install Firefox | out-null
- cmd: >-
node --version
npm --version
npm install
npm i --loglevel error
build: off

# NOTE: We should prerun Firefox to avoid "Refresh Firefox" notification in the tests window.
test_script:
- cmd: start /D "C:\Program Files (x86)\Mozilla Firefox" firefox.exe -new-window https://google.com
- cmd: npm test

for:
-
branches:
only:
- master

notifications:
- provider: Email
to:
- [email protected]
- [email protected]
- [email protected]
on_build_success: false
on_build_status_changed: false

test_script:
- cmd: >-
node node_modules/gulp/bin/gulp test-functional-local
node node_modules/gulp/bin/gulp test-functional-local-legacy
12 changes: 0 additions & 12 deletions test/functional/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ testingEnvironments[testingEnvironmentNames.oldBrowsers] = {
};

testingEnvironments[testingEnvironmentNames.legacy] = {
jobName: 'functional tests - legacy',

sauceLabs: {
username: process.env.SAUCE_USERNAME_FUNCTIONAL_DESKTOP,
accessKey: process.env.SAUCE_ACCESS_KEY_FUNCTIONAL_DESKTOP
},

browsers: [
{
platform: 'Windows 10',
Expand All @@ -154,11 +147,6 @@ testingEnvironments[testingEnvironmentNames.legacy] = {
browserName: 'internet explorer',
version: '11.0',
alias: 'ie'
},
{
platform: 'Windows 10',
browserName: 'firefox',
alias: 'firefox'
}
]
};
Expand Down
10 changes: 7 additions & 3 deletions test/functional/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ function closeLocalBrowsers () {
before(function () {
var mocha = this;

mocha.timeout(60000);

return createTestCafe(config.testCafe.hostname, config.testCafe.port1, config.testCafe.port2)
.then(function (tc) {
testCafe = tc;
Expand Down Expand Up @@ -269,7 +271,9 @@ after(function () {
return closeLocalBrowsers();
});


// TODO: Run takeScreenshot tests first because other tests heavily impact them
require('./fixtures/api/es-next/take-screenshot/test');
require('./fixtures/screenshots-on-fails/test');
if (envName === config.testingEnvironmentNames.localBrowsers) {
require('./fixtures/api/es-next/take-screenshot/test');
require('./fixtures/screenshots-on-fails/test');
}

0 comments on commit 6951198

Please sign in to comment.