Skip to content

Commit 48c5191

Browse files
author
Bernie Zang
committed
chore(eslint): Enable eslint on all js files and fix errors
1 parent 511a5f9 commit 48c5191

File tree

40 files changed

+1774
-1749
lines changed

40 files changed

+1774
-1749
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"jest": "cross-env TZ=utc jest --config=jest.config.json",
2323
"static-analysis": "npm run eslint",
2424
"lint:eslint": "eslint --ignore-path .gitignore $(npm run --silent lint:eslint:ci-reporter)",
25-
"eslint": "eslint packages",
25+
"eslint": "eslint ./",
2626
"serve": "npm run start",
2727
"stylelint": "stylelint \"./packages/node_modules/**/*.css\"",
2828
"start": "cross-env NODE_ENV=${NODE_ENV:-development} ./scripts/start/index.js",

‎packages/node_modules/@ciscospark/widget-space/src/index.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎postcss.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
/* eslint-disable no-empty-function */
21
module.exports = (ctx) => ({
32
plugins: {
43
'postcss-modules': {
54
getJSON: ctx.extractModules || (() => {}),
6-
generateScopedName: `[local]--[hash:base64:5]`
5+
generateScopedName: '[local]--[hash:base64:5]'
76
},
87
'postcss-cssnext': {
9-
browsers: [`last 2 versions`, `IE > 10`]
8+
browsers: ['last 2 versions', 'IE > 10']
109
},
1110
cssnano: {
12-
preset: `default`,
11+
preset: 'default',
1312
autoprefixer: false
1413
},
1514
'postcss-reporter': {}

‎test/journeys/.eslintrc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
extends: '../../.eslintrc.js',
3+
env: {
4+
mocha: true
5+
},
6+
globals: {
7+
browser: true,
8+
$: true
9+
},
10+
rules: {
11+
'no-console': 'off'
12+
}
13+
};

‎test/journeys/.eslintrc.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/journeys/lib/axe.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* @returns {Promise}
1212
* https://github.com/dequelabs/axe-core/blob/develop/doc/API.md#options-parameter-examples
1313
*/
14-
export const runAxe = (aBrowser, elementId, rules = [`best-practice`]) =>
14+
export const runAxe = (aBrowser, elementId, rules = ['best-practice']) =>
1515
new Promise((resolve, reject) => {
1616
const axeResults = aBrowser.executeAsync((theElementId, theRules, done) => {
1717
const widgetElement = document.getElementById(theElementId);
1818
const options = {
1919
runOnly: {
20-
type: `tag`,
20+
type: 'tag',
2121
values: theRules
2222
}
2323
};
@@ -29,5 +29,8 @@ export const runAxe = (aBrowser, elementId, rules = [`best-practice`]) =>
2929
reject(axeResults.value.err);
3030
}
3131
resolve(axeResults.value.results);
32-
}
33-
);
32+
});
33+
34+
export default {
35+
runAxe
36+
};

‎test/journeys/lib/events.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @returns {void}
77
*/
88
export function clearEventLog(myBrowser) {
9-
myBrowser.execute(() => {window.ciscoSparkEvents.length = 0;});
9+
myBrowser.execute(() => { window.ciscoSparkEvents.length = 0; });
1010
}
1111

1212
/**
@@ -20,8 +20,8 @@ export function getEventLog(myBrowser) {
2020
const result = myBrowser.execute(() => {
2121
const events = window.ciscoSparkEvents.map((event) => {
2222
// Passing the call object from the browser causes an overflow
23-
if (event.detail && event.detail.data && event.detail.data.hasOwnProperty(`call`)) {
24-
Reflect.deleteProperty(event.detail.data, `call`);
23+
if (event.detail && event.detail.data && Object.prototype.hasOwnProperty.call(event.detail.data, 'call')) {
24+
Reflect.deleteProperty(event.detail.data, 'call');
2525
}
2626
return event;
2727
});

‎test/journeys/lib/hydra.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ import {base64} from '@ciscospark/common';
33
export function constructHydraId(type, id) {
44
return base64.encode(`ciscospark://us/${type.toUpperCase()}/${id}`);
55
}
6+
7+
export default {
8+
constructHydraId
9+
};

‎test/journeys/lib/test-helpers/recents-widget/index.js

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import {assert} from 'chai';
2+
23
import waitForPromise from '../../wait-for-promise';
34

45
export const elements = {
5-
recentsWidget: `.ciscospark-spaces-list-wrapper`,
6-
firstSpace: `.space-item:first-child`,
7-
title: `.space-title`,
8-
unreadIndicator: `.space-unread-indicator`,
9-
lastActivity: `.space-last-activity`,
10-
callButton: `button[aria-label="Call Space"]`
6+
recentsWidget: '.ciscospark-spaces-list-wrapper',
7+
firstSpace: '.space-item:first-child',
8+
title: '.space-title',
9+
unreadIndicator: '.space-unread-indicator',
10+
lastActivity: '.space-last-activity',
11+
callButton: 'button[aria-label="Call Space"]'
1112
};
1213

1314
/**
@@ -28,13 +29,13 @@ export function displayIncomingMessage(aBrowser, sender, conversation, message,
2829
}));
2930
aBrowser.waitUntil(() =>
3031
aBrowser.element(`${elements.firstSpace} ${elements.title}`).getText() === spaceTitle
31-
, 5000
32-
, `conversation not displayed`);
32+
, 5000
33+
, 'conversation not displayed');
3334
aBrowser.waitUntil(() =>
3435
aBrowser.element(`${elements.firstSpace} ${elements.lastActivity}`).getText().includes(message)
35-
, 5000
36-
, `does not have last message displayed`);
37-
assert.isTrue(aBrowser.element(`${elements.firstSpace} ${elements.unreadIndicator}`).isVisible(), `does not have unread indicator`);
36+
, 5000
37+
, 'does not have last message displayed');
38+
assert.isTrue(aBrowser.element(`${elements.firstSpace} ${elements.unreadIndicator}`).isVisible(), 'does not have unread indicator');
3839
}
3940

4041
/**
@@ -58,17 +59,15 @@ export function displayAndReadIncomingMessage(aBrowser, sender, receiver, conver
5859
}));
5960
aBrowser.waitUntil(() =>
6061
aBrowser.element(`${elements.firstSpace} ${elements.lastActivity}`).getText().includes(message),
61-
5000,
62-
`does not have last message sent`
63-
);
64-
assert.isTrue(aBrowser.element(`${elements.firstSpace} ${elements.unreadIndicator}`).isVisible(), `does not have unread indicator`);
62+
5000,
63+
'does not have last message sent');
64+
assert.isTrue(aBrowser.element(`${elements.firstSpace} ${elements.unreadIndicator}`).isVisible(), 'does not have unread indicator');
6565
// Acknowledge the activity to mark it read
6666
waitForPromise(receiver.spark.internal.conversation.acknowledge(conversation, activity));
6767
aBrowser.waitUntil(() =>
6868
!aBrowser.element(`${elements.firstSpace} ${elements.unreadIndicator}`).isVisible(),
69-
5000,
70-
`does not remove unread indicator`
71-
);
69+
5000,
70+
'does not remove unread indicator');
7271
}
7372

7473
/**
@@ -100,17 +99,14 @@ export function createSpaceAndPost(aBrowser, sender, participants, roomTitle, fi
10099
return sender.spark.internal.conversation.post(c, {
101100
displayName: firstPost
102101
});
103-
})
104-
);
102+
}));
105103
aBrowser.waitUntil(() =>
106104
aBrowser.element(`${elements.firstSpace} ${elements.title}`).getText().includes(spaceTitle),
107-
5000,
108-
`does not display newly created space title`
109-
);
105+
5000,
106+
'does not display newly created space title');
110107
aBrowser.waitUntil(() =>
111108
aBrowser.element(`${elements.firstSpace} ${elements.lastActivity}`).getText().includes(firstPost),
112-
5000,
113-
`does not have last message sent`
114-
);
109+
5000,
110+
'does not have last message sent');
115111
return conversation;
116112
}

‎test/journeys/lib/test-helpers/space-widget/featureFlags.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,54 @@ import {elements as meetElements} from './meet';
1414
* @returns {null}
1515
*/
1616
export default function featureFlagTests(browserWithAllTheFeatures, browserWithNoFeatures) {
17-
describe(`Roster Feature Flag`, () => {
18-
it(`has a roster for user with feature flag`, () => {
17+
describe('Roster Feature Flag', () => {
18+
it('has a roster for user with feature flag', () => {
1919
browserWithAllTheFeatures.click(mainElements.menuButton);
2020
browserWithAllTheFeatures.waitForVisible(mainElements.activityMenu);
21-
assert.isTrue(browserWithAllTheFeatures.element(mainElements.controlsContainer).element(rosterElements.peopleButton).isVisible());
21+
assert.isTrue(
22+
browserWithAllTheFeatures
23+
.element(mainElements.controlsContainer)
24+
.element(rosterElements.peopleButton)
25+
.isVisible()
26+
);
2227
browserWithAllTheFeatures.click(mainElements.exitButton);
2328
});
2429

25-
it(`does not have a roster for user without flag`, () => {
30+
it('does not have a roster for user without flag', () => {
2631
browserWithNoFeatures.click(mainElements.menuButton);
2732
browserWithNoFeatures.waitForVisible(mainElements.activityMenu);
28-
assert.isFalse(browserWithNoFeatures.element(mainElements.controlsContainer).element(rosterElements.peopleButton).isVisible());
33+
assert.isFalse(
34+
browserWithNoFeatures
35+
.element(mainElements.controlsContainer)
36+
.element(rosterElements.peopleButton)
37+
.isVisible()
38+
);
2939
browserWithNoFeatures.click(mainElements.exitButton);
3040
});
3141
});
3242

33-
describe(`Group Calling Feature Flag`, () => {
34-
it(`has a call option for user with feature flag`, () => {
43+
describe('Group Calling Feature Flag', () => {
44+
it('has a call option for user with feature flag', () => {
3545
browserWithAllTheFeatures.click(mainElements.menuButton);
3646
browserWithAllTheFeatures.waitForVisible(mainElements.activityMenu);
37-
assert.isTrue(browserWithAllTheFeatures.element(mainElements.controlsContainer).element(meetElements.callButton).isVisible());
47+
assert.isTrue(
48+
browserWithAllTheFeatures
49+
.element(mainElements.controlsContainer)
50+
.element(meetElements.callButton)
51+
.isVisible()
52+
);
3853
browserWithAllTheFeatures.click(mainElements.exitButton);
3954
});
4055

41-
it(`does not have a call option for user without flag`, () => {
56+
it('does not have a call option for user without flag', () => {
4257
browserWithNoFeatures.click(mainElements.menuButton);
4358
browserWithNoFeatures.waitForVisible(mainElements.activityMenu);
44-
assert.isFalse(browserWithNoFeatures.element(mainElements.controlsContainer).element(meetElements.callButton).isVisible());
59+
assert.isFalse(
60+
browserWithNoFeatures
61+
.element(mainElements.controlsContainer)
62+
.element(meetElements.callButton)
63+
.isVisible()
64+
);
4565
browserWithNoFeatures.click(mainElements.exitButton);
4666
});
4767
});

0 commit comments

Comments
 (0)