mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-19 14:13:34 +01:00
lint: Rerun eslint --fix
to nuke trailing function call commas
eslint-config-etherpad 1.0.11 changed the comma-dangle rule to
prohibit trailing commas for function arguments. See:
673ab07acf
Re-run the automated fixes to apply the rule change.
This also fixes a few lint issues in changes that were made after
`eslint --fix` was originally run.
This commit is contained in:
parent
98967735d5
commit
107942ad8a
8 changed files with 11 additions and 11 deletions
|
@ -93,7 +93,7 @@ describe('change user color', function () {
|
||||||
$chatInput.sendkeys('{enter}'); // simulate a keypress of enter actually does evt.which = 10 not 13
|
$chatInput.sendkeys('{enter}'); // simulate a keypress of enter actually does evt.which = 10 not 13
|
||||||
|
|
||||||
// check if chat shows up
|
// check if chat shows up
|
||||||
helper.waitFor(() => chrome$('#chattext').children('p').length !== 0, // wait until the chat message shows up
|
helper.waitFor(() => chrome$('#chattext').children('p').length !== 0 // wait until the chat message shows up
|
||||||
).done(() => {
|
).done(() => {
|
||||||
const $firstChatMessage = chrome$('#chattext').children('p');
|
const $firstChatMessage = chrome$('#chattext').children('p');
|
||||||
expect($firstChatMessage.css('background-color')).to.be(testColorRGB); // expect the first chat message to be of the user's color
|
expect($firstChatMessage.css('background-color')).to.be(testColorRGB); // expect the first chat message to be of the user's color
|
||||||
|
|
|
@ -60,7 +60,7 @@ describe('change username value', function () {
|
||||||
$chatInput.sendkeys('{enter}'); // simulate a keypress of enter actually does evt.which = 10 not 13
|
$chatInput.sendkeys('{enter}'); // simulate a keypress of enter actually does evt.which = 10 not 13
|
||||||
|
|
||||||
// check if chat shows up
|
// check if chat shows up
|
||||||
helper.waitFor(() => chrome$('#chattext').children('p').length !== 0, // wait until the chat message shows up
|
helper.waitFor(() => chrome$('#chattext').children('p').length !== 0 // wait until the chat message shows up
|
||||||
).done(() => {
|
).done(() => {
|
||||||
const $firstChatMessage = chrome$('#chattext').children('p');
|
const $firstChatMessage = chrome$('#chattext').children('p');
|
||||||
const containsJohnMcLear = $firstChatMessage.text().indexOf('John McLear') !== -1; // does the string contain John McLear
|
const containsJohnMcLear = $firstChatMessage.text().indexOf('John McLear') !== -1; // does the string contain John McLear
|
||||||
|
|
|
@ -28,7 +28,7 @@ describe('clear authorship colors button', function () {
|
||||||
$firstTextElement.sendkeys(sentText);
|
$firstTextElement.sendkeys(sentText);
|
||||||
$firstTextElement.sendkeys('{rightarrow}');
|
$firstTextElement.sendkeys('{rightarrow}');
|
||||||
|
|
||||||
helper.waitFor(() => inner$('div span').first().attr('class').indexOf('author') !== -1, // wait until we have the full value available
|
helper.waitFor(() => inner$('div span').first().attr('class').indexOf('author') !== -1 // wait until we have the full value available
|
||||||
).done(() => {
|
).done(() => {
|
||||||
// IE hates you if you don't give focus to the inner frame bevore you do a clearAuthorship
|
// IE hates you if you don't give focus to the inner frame bevore you do a clearAuthorship
|
||||||
inner$('div').first().focus();
|
inner$('div').first().focus();
|
||||||
|
@ -80,7 +80,7 @@ describe('clear authorship colors button', function () {
|
||||||
$firstTextElement.sendkeys(sentText);
|
$firstTextElement.sendkeys(sentText);
|
||||||
$firstTextElement.sendkeys('{rightarrow}');
|
$firstTextElement.sendkeys('{rightarrow}');
|
||||||
|
|
||||||
helper.waitFor(() => inner$('div span').first().attr('class').indexOf('author') !== -1, // wait until we have the full value available
|
helper.waitFor(() => inner$('div span').first().attr('class').indexOf('author') !== -1 // wait until we have the full value available
|
||||||
).done(() => {
|
).done(() => {
|
||||||
// IE hates you if you don't give focus to the inner frame bevore you do a clearAuthorship
|
// IE hates you if you don't give focus to the inner frame bevore you do a clearAuthorship
|
||||||
inner$('div').first().focus();
|
inner$('div').first().focus();
|
||||||
|
|
|
@ -136,7 +136,7 @@ describe('import functionality', function () {
|
||||||
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li><li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul><li>bullet2 line 1</li></ul></body></html>';
|
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li></ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li><li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul><li>bullet2 line 1</li></ul></body></html>';
|
||||||
importrequest(htmlWithBullets, importurl, 'html');
|
importrequest(htmlWithBullets, importurl, 'html');
|
||||||
const oldtext = getinnertext();
|
const oldtext = getinnertext();
|
||||||
helper.waitFor(() => oldtext != getinnertext(),
|
helper.waitFor(() => oldtext != getinnertext()
|
||||||
// return expect(getinnertext()).to.be('\
|
// return expect(getinnertext()).to.be('\
|
||||||
// <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
|
// <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
|
||||||
// <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
|
// <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
|
||||||
|
|
|
@ -53,7 +53,7 @@ xdescribe('Responsiveness of Editor', function () {
|
||||||
inner$('div').first().text(text); // Put the text contents into the pad
|
inner$('div').first().text(text); // Put the text contents into the pad
|
||||||
|
|
||||||
helper.waitFor(() => // Wait for the new contents to be on the pad
|
helper.waitFor(() => // Wait for the new contents to be on the pad
|
||||||
inner$('div').text().length > length,
|
inner$('div').text().length > length
|
||||||
).done(() => {
|
).done(() => {
|
||||||
expect(inner$('div').text().length).to.be.greaterThan(length); // has the text changed?
|
expect(inner$('div').text().length).to.be.greaterThan(length); // has the text changed?
|
||||||
const start = Date.now(); // get the start time
|
const start = Date.now(); // get the start time
|
||||||
|
|
|
@ -18,7 +18,7 @@ xdescribe('timeslider button takes you to the timeslider of a pad', function ()
|
||||||
const modifiedValue = $firstTextElement.text(); // get the modified value
|
const modifiedValue = $firstTextElement.text(); // get the modified value
|
||||||
expect(modifiedValue).not.to.be(originalValue); // expect the value to change
|
expect(modifiedValue).not.to.be(originalValue); // expect the value to change
|
||||||
|
|
||||||
helper.waitFor(() => modifiedValue !== originalValue, // The value has changed so we can..
|
helper.waitFor(() => modifiedValue !== originalValue // The value has changed so we can..
|
||||||
).done(() => {
|
).done(() => {
|
||||||
const $timesliderButton = chrome$('#timesliderlink');
|
const $timesliderButton = chrome$('#timesliderlink');
|
||||||
$timesliderButton.click(); // So click the timeslider link
|
$timesliderButton.click(); // So click the timeslider link
|
||||||
|
|
|
@ -42,7 +42,7 @@ describe('timeslider follow', function () {
|
||||||
const lines = helper.linesDiv();
|
const lines = helper.linesDiv();
|
||||||
helper.selectLines(lines[0], lines[lines.length - 1]); // select all lines
|
helper.selectLines(lines[0], lines[lines.length - 1]); // select all lines
|
||||||
// probably unnecessary, but wait for the selection to be Range not Caret
|
// probably unnecessary, but wait for the selection to be Range not Caret
|
||||||
await helper.waitForPromise(() => !helper.padInner$.document.getSelection().isCollapsed,
|
await helper.waitForPromise(() => !helper.padInner$.document.getSelection().isCollapsed
|
||||||
// only supported in FF57+
|
// only supported in FF57+
|
||||||
// return helper.padInner$.document.getSelection().type === 'Range';
|
// return helper.padInner$.document.getSelection().type === 'Range';
|
||||||
);
|
);
|
||||||
|
|
|
@ -15,10 +15,10 @@ var allTestsPassed = true;
|
||||||
// and the script would silently exit with error code 0
|
// and the script would silently exit with error code 0
|
||||||
process.exitCode = 2;
|
process.exitCode = 2;
|
||||||
process.on('exit', (code) => {
|
process.on('exit', (code) => {
|
||||||
if (code === 2){
|
if (code === 2) {
|
||||||
console.log("\x1B[31mFAILED\x1B[39m Not all saucelabs runner have been started.");
|
console.log('\x1B[31mFAILED\x1B[39m Not all saucelabs runner have been started.');
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
var sauceTestWorker = async.queue((testSettings, callback) => {
|
var sauceTestWorker = async.queue((testSettings, callback) => {
|
||||||
const browser = wd.promiseChainRemote(config.host, config.port, config.username, config.accessKey);
|
const browser = wd.promiseChainRemote(config.host, config.port, config.username, config.accessKey);
|
||||||
|
|
Loading…
Reference in a new issue