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

chore: Replace istanbul with nyc #2209

Merged
merged 12 commits into from
Mar 1, 2020
Merged

chore: Replace istanbul with nyc #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
38dd028
chore: Replace istanbul with nyc
iamareebjamal Mar 1, 2020
5a7445d
Update .travis.yml
iamareebjamal Mar 1, 2020
ef018f9
f
iamareebjamal Mar 1, 2020
277c9f1
f
iamareebjamal Mar 1, 2020
1f2aa3e
f
iamareebjamal Mar 1, 2020
19d1ee0
f
iamareebjamal Mar 1, 2020
8b118fa
f
iamareebjamal Mar 1, 2020
91aa88f
f
iamareebjamal Mar 1, 2020
dc1951f
f
iamareebjamal Mar 1, 2020
35f62ca
f
iamareebjamal Mar 1, 2020
4cd4ea3
f
iamareebjamal Mar 1, 2020
55009cb
f
iamareebjamal Mar 1, 2020
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
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: xenial
language: node_js
node_js:
- 8.15.1
- 10.16.1

services:
- docker
Expand All @@ -24,15 +24,16 @@ addons:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- chromium-chromedriver
# installing required items for build
install:
- npm install -g yarn
- yarn global add istanbul mocha@3
- yarn global add nyc mocha
- yarn

# testing script
script:
- istanbul cover _mocha -- $TESTFOLDER
- nyc mocha --exit -- $TESTFOLDER

# notify codecov and deploy to cloud
after_success:
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "2.0.0",
"description": "Open Event Webapp",
"engines": {
"node": "8.15.1",
"node": "10.16.1",
"npm": "5.6.0"
},
"main": "index.js",
"scripts": {
"start": "node src/app.js",
"test": "mocha",
"coverage": "istanbul cover _mocha",
"coverage": "nyc mocha",
"lint": "eslint ./src",
"precommit": "eslint ./src"
},
Expand Down
3 changes: 0 additions & 3 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

const express = require('express');
const cookie = require('cookie');
const connectDomain = require('connect-domain');
const compression = require('compression');
const path = require('path');
const cookieParser = require('cookie-parser');
Expand Down Expand Up @@ -168,8 +167,6 @@ io.of('/deploy').on('connection', function(socket) {
});
});

app.use(connectDomain());

const errorHandler = function(err, req, res, next) {
res.sendFile(__dirname + '/www/404.html');
next();
Expand Down
33 changes: 2 additions & 31 deletions test/generatorAndSchedule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const assert = require('chai').assert;
let generator = require('../src/backend/generator.js');
let app = require('../src/app');
let webdriver = require('selenium-webdriver');
let { getDriver } = require('./helper');
let schedulePage = require('../src/selenium/schedulePage.js');
let generatorPage = require('../src/selenium/generatorPage');

Expand Down Expand Up @@ -71,36 +71,7 @@ describe("Running Selenium tests on Chrome Driver", function () {
let driver;

before(function () {
if (process.env.SAUCE_USERNAME !== undefined) {
driver = new webdriver.Builder()
.usingServer('http://' + process.env.SAUCE_USERNAME + ':' + process.env.SAUCE_ACCESS_KEY + '@ondemand.saucelabs.com:80/wd/hub')
.withCapabilities({
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
} else {
driver = new webdriver.Builder()
.withCapabilities({
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
}
driver = getDriver();
});

after(function () {
Expand Down
38 changes: 38 additions & 0 deletions test/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
require('dotenv').config();
const webdriver = require('selenium-webdriver');

function getDriver() {
const capabilities = {
browserName: "chrome",
chromeOptions: {
prefs: {
'downloads': {
'prompt_for_download': false
}
},
args: [
'--window-size=1920,1080',
'--start-maximized'
]
}
};

if (process.env.SAUCE_USERNAME !== undefined) {
return new webdriver.Builder()
.usingServer('http://' + process.env.SAUCE_USERNAME + ':' + process.env.SAUCE_ACCESS_KEY + '@ondemand.saucelabs.com:80/wd/hub')
.withCapabilities({
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
...capabilities
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsing error: Unexpected token ..

}).build();
} else {
return new webdriver.Builder()
.withCapabilities(capabilities).build();
}
}

module.exports = {
getDriver
}
33 changes: 2 additions & 31 deletions test/roomsAndSpeakers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const assert = require('chai').assert;
let generator = require('../src/backend/generator.js');
let app = require('../src/app');
let webdriver = require('selenium-webdriver');
const { getDriver } = require('./helper');
let speakerPage = require('../src/selenium/speakerPage.js');
let roomPage = require('../src/selenium/roomPage.js');

Expand Down Expand Up @@ -72,36 +72,7 @@ describe("Running Selenium tests on Chrome Driver", function() {
let driver;

before(function() {
if (process.env.SAUCE_USERNAME !== undefined) {
driver = new webdriver.Builder()
.usingServer('http://' + process.env.SAUCE_USERNAME + ':' + process.env.SAUCE_ACCESS_KEY + '@ondemand.saucelabs.com:80/wd/hub')
.withCapabilities({
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
} else {
driver = new webdriver.Builder()
.withCapabilities({
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
}
driver = getDriver();
});

after(function() {
Expand Down
33 changes: 2 additions & 31 deletions test/sessionEventAndCoC.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const assert = require('chai').assert;
let generator = require('../src/backend/generator.js');
let app = require('../src/app');
let webdriver = require('selenium-webdriver');
const { getDriver } = require('./helper');
let sessionPage = require('../src/selenium/sessionPage.js');
let eventPage = require('../src/selenium/eventPage.js');
let cocPage = require('../src/selenium/cocPage.js');
Expand Down Expand Up @@ -64,36 +64,7 @@ describe("Running Selenium tests on Chrome Driver", function() {
let driver;

before(function() {
if (process.env.SAUCE_USERNAME !== undefined) {
driver = new webdriver.Builder()
.usingServer('http://' + process.env.SAUCE_USERNAME + ':' + process.env.SAUCE_ACCESS_KEY + '@ondemand.saucelabs.com:80/wd/hub')
.withCapabilities({
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
} else {
driver = new webdriver.Builder()
.withCapabilities({
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
}
driver = getDriver();
});

after(function() {
Expand Down
33 changes: 2 additions & 31 deletions test/tracks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const assert = require('chai').assert;
let generator = require('../src/backend/generator.js');
let app = require('../src/app');
let webdriver = require('selenium-webdriver');
const { getDriver } = require('./helper');
let trackPage = require('../src/selenium/trackPage.js');

describe('app', () => {
Expand Down Expand Up @@ -65,36 +65,7 @@ describe("Running Selenium tests on Chrome Driver", function() {
let driver;

before(function() {
if (process.env.SAUCE_USERNAME !== undefined) {
driver = new webdriver.Builder()
.usingServer('http://' + process.env.SAUCE_USERNAME + ':' + process.env.SAUCE_ACCESS_KEY + '@ondemand.saucelabs.com:80/wd/hub')
.withCapabilities({
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
} else {
driver = new webdriver.Builder()
.withCapabilities({
browserName: "chrome",
'chromeOptions': {
prefs: {
'downloads': {
'prompt_for_download': false
}
}
}
}).build();
}
driver = getDriver();
});

after(function() {
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,11 +1670,6 @@ configstore@^3.0.0:
write-file-atomic "^2.0.0"
xdg-basedir "^3.0.0"

connect-domain@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/connect-domain/-/connect-domain-0.5.0.tgz#8b6e46cc7b33e57bcf9e3fe789a3185c3eaa3868"
integrity sha1-i25GzHsz5XvPnj/niaMYXD6qOGg=

console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
Expand Down