Merge pull request #123 from Financial-Times/@maxcbc/linting

Fix eslint problems
Financial-Times · Aug 7, 2019 · 02a6821 · 02a6821
2 parents eb4aa1b + a100586
commit 02a6821
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 141 deletions.
diff --git a/bin/n-test.js b/bin/n-test.js
@@ -19,13 +19,13 @@ program
 	.description('')
 	.action(function (app) {
 
-			if(app && app.toUpperCase().startsWith('HALP')) {
-				halp();
-			} else {
-				// eslint-disable-next-line no-console
-				console.error(`The command ${app} is not known`);
-				process.exit(1);
-			}
+		if(app && app.toUpperCase().startsWith('HALP')) {
+			halp();
+		} else {
+			// eslint-disable-next-line no-console
+			console.error(`The command ${app} is not known`);
+			process.exit(1);
+		}
 	});
 
 

diff --git a/lib/checks/elements.js b/lib/checks/elements.js
@@ -3,7 +3,7 @@ module.exports = async (testPage) => {
 	//eslint randomly started failing this, even though it is guarded!
 	//eslint-disable-next-line guard-for-in
 	for(const selector in testPage.check.elements) {
-			if(testPage.check.elements.hasOwnProperty(selector)) {
+		if(testPage.check.elements.hasOwnProperty(selector)) {
 			const assertion = testPage.check.elements[selector];
 			//If we're expecting an element, wait for it.
 
@@ -30,12 +30,12 @@ module.exports = async (testPage) => {
 				});
 			} else if (typeof assertion === 'string') {
 
-					const elText = await testPage.getElementText(selector);
-					results.push({
-						expected: `element with selector selector ${selector} should contain text ${assertion}`,
-						actual: elText,
-						result: elText.includes(assertion)
-					});
+				const elText = await testPage.getElementText(selector);
+				results.push({
+					expected: `element with selector selector ${selector} should contain text ${assertion}`,
+					actual: elText,
+					result: elText.includes(assertion)
+				});
 			}
 		};
 

diff --git a/test/fixtures/jank-test.js b/test/fixtures/jank-test.js
@@ -7,5 +7,5 @@ module.exports = [{
 				}
 			}
 		}
-}
+	}
 }];
diff --git a/test/fixtures/smoke-custom-check.js b/test/fixtures/smoke-custom-check.js
@@ -1,8 +1,8 @@
 module.exports = [{
-		urls: {
-			'/status/200': {
-				custom: 20
-			}
+	urls: {
+		'/status/200': {
+			custom: 20
 		}
 	}
+}
 ];
diff --git a/test/fixtures/smoke-error-fail.js b/test/fixtures/smoke-error-fail.js
@@ -1,11 +1,11 @@
 
 module.exports = [{
-		urls: {
-			'/status/200?1': { status: 200, https: true }, //These three will fail because the test server doesn't support https
-			'/status/200?2': { status: 200, https: true },
-			'/status/200?3': { status: 200, https: true },
-			'/status/200?4': { status: 200, https: false }
-		}
+	urls: {
+		'/status/200?1': { status: 200, https: true }, //These three will fail because the test server doesn't support https
+		'/status/200?2': { status: 200, https: true },
+		'/status/200?3': { status: 200, https: true },
+		'/status/200?4': { status: 200, https: false }
 	}
+}
 
 ];
diff --git a/test/fixtures/smoke-error-pass.js b/test/fixtures/smoke-error-pass.js
@@ -1,9 +1,9 @@
 module.exports = [{
-		urls: {
-			'/status/200?1': { status: 200, https: true }, //These two will fail because the test server doesn't support https
-			'/status/200?2': { status: 200, https: true },
-			'/status/200?3': { status: 200, https: false },
-			'/status/200?4': { status: 200, https: false },
-		}
+	urls: {
+		'/status/200?1': { status: 200, https: true }, //These two will fail because the test server doesn't support https
+		'/status/200?2': { status: 200, https: true },
+		'/status/200?3': { status: 200, https: false },
+		'/status/200?4': { status: 200, https: false },
 	}
+}
 ];
diff --git a/test/fixtures/smoke-fail.js b/test/fixtures/smoke-fail.js
@@ -1,34 +1,34 @@
 const assert = require('assert');
 
 module.exports = [{
-		urls: {
-			'/status/503': 200,
-			'/status/404': {
-				status: 404
-			},
-			'/coverage/bad': {
-				cssCoverage: {
-					'coverage/bad': 50
-				}
-			},
-			'/coverage/okay': {
-				cssCoverage: {
-					'coverage/okay': 60
-				}
-			},
-			'/jank': {
-				elementShifts: {
-					'.content': {
-						maxCount: 0
-					}
-				}
-			},
-			'/json': {
-				content: (body) => {
-					assert.equal(body.key, 'wrong-value');
+	urls: {
+		'/status/503': 200,
+		'/status/404': {
+			status: 404
+		},
+		'/coverage/bad': {
+			cssCoverage: {
+				'coverage/bad': 50
+			}
+		},
+		'/coverage/okay': {
+			cssCoverage: {
+				'coverage/okay': 60
+			}
+		},
+		'/jank': {
+			elementShifts: {
+				'.content': {
+					maxCount: 0
 				}
 			}
+		},
+		'/json': {
+			content: (body) => {
+				assert.equal(body.key, 'wrong-value');
+			}
 		}
 	}
+}
 
 ];
diff --git a/test/fixtures/smoke-pass.js b/test/fixtures/smoke-pass.js
@@ -1,74 +1,74 @@
 module.exports = [{
-		urls: {
-			'/status/200': 200,
-			'/status/204': 204, // this will be skipped because we don't support it yet!
-			'/status/404': {
-				status: 404,
-				content: '404',
-				responseHeaders: {
-					'X-Powered-By': 'Express'
-				}
-			},
-			'/status/302': 302,
-			'/redirect': '/status/200',
-			'/post': {
-				method: 'POST',
-				body: 'stuff',
-				status: 200,
-				content: (content) => {
-					return content.includes('stuff');
-				}
-			},
-			'/json' : {
-				content: (content) => JSON.parse(content).key === 'value'
-			},
-			'/network-requests': {
-				waitUntil: 'load',
-				networkRequests: {
-					'/status/200': 1,
-					'/status': 2,
-					'/status/2': true,
-					'/json': false
-				}
-			},
-			'/coverage/good': {
-				waitUntil: 'load',
-				elements: {
-					'.one': 1,
-					'.two': 1,
-					'div': 3,
-					'.does-not-exist': 0,
-					'.no-content': false
-				},
-				cssCoverage: {
-					'coverage/good': 50
-				}
-			},
-			'/coverage/okay': {
-				waitUntil: 'load',
-				elements: {
-					'.one': true,
-					'.three': 0
-				},
-				cssCoverage: {
-					'coverage/okay': 50
-				}
+	urls: {
+		'/status/200': 200,
+		'/status/204': 204, // this will be skipped because we don't support it yet!
+		'/status/404': {
+			status: 404,
+			content: '404',
+			responseHeaders: {
+				'X-Powered-By': 'Express'
+			}
+		},
+		'/status/302': 302,
+		'/redirect': '/status/200',
+		'/post': {
+			method: 'POST',
+			body: 'stuff',
+			status: 200,
+			content: (content) => {
+				return content.includes('stuff');
+			}
+		},
+		'/json' : {
+			content: (content) => JSON.parse(content).key === 'value'
+		},
+		'/network-requests': {
+			waitUntil: 'load',
+			networkRequests: {
+				'/status/200': 1,
+				'/status': 2,
+				'/status/2': true,
+				'/json': false
+			}
+		},
+		'/coverage/good': {
+			waitUntil: 'load',
+			elements: {
+				'.one': 1,
+				'.two': 1,
+				'div': 3,
+				'.does-not-exist': 0,
+				'.no-content': false
 			},
-			'/no-jank': {
-				elementShifts: {
-					'.content': {
-						maxCount: 0,
-						maxPixels: 0
-					}
-				}
+			cssCoverage: {
+				'coverage/good': 50
+			}
+		},
+		'/coverage/okay': {
+			waitUntil: 'load',
+			elements: {
+				'.one': true,
+				'.three': 0
 			},
-			'/actions': {
-				actions: [
-					'click element .my-button'
-				],
-				elements: {
-					'.content': true
+			cssCoverage: {
+				'coverage/okay': 50
+			}
+		},
+		'/no-jank': {
+			elementShifts: {
+				'.content': {
+					maxCount: 0,
+					maxPixels: 0
 				}
 			}
+		},
+		'/actions': {
+			actions: [
+				'click element .my-button'
+			],
+			elements: {
+				'.content': true
+			}
+		}
 	}
 }];
diff --git a/test/server/app.js b/test/server/app.js
@@ -59,7 +59,7 @@ app.post('/post', (req, res) => {
 		body += chunk.toString();
 	});
 	req.on('end', () => {
-;		res.send('GOT: ' + body);
+		;		res.send('GOT: ' + body);
 	});
 });
 

diff --git a/test/tasks/smoke.test.js b/test/tasks/smoke.test.js
@@ -20,12 +20,12 @@ describe('Smoke Tests of the Smoke', () => {
 				config: 'test/fixtures/smoke-pass.js'
 			});
 			return smoke.run()
-			.then((results) => {
-				expect(results.passed.length).toEqual(12);
-				expect(results.failed.length).toEqual(0);
-				expect(results.errors.length).toEqual(0);
-				done();
-			});
+				.then((results) => {
+					expect(results.passed.length).toEqual(12);
+					expect(results.failed.length).toEqual(0);
+					expect(results.errors.length).toEqual(0);
+					done();
+				});
 		}, 10000);
 
 		test('tests should fail if some tests fail', (done) => {
@@ -35,12 +35,12 @@ describe('Smoke Tests of the Smoke', () => {
 				config: 'test/fixtures/smoke-fail.js'
 			});
 			return smoke.run()
-			.catch((results) => {
-				expect(results.passed.length).toEqual(1);
-				expect(results.failed.length).toEqual(5);
-				expect(results.errors.length).toEqual(0);
-				done();
-			});
+				.catch((results) => {
+					expect(results.passed.length).toEqual(1);
+					expect(results.failed.length).toEqual(5);
+					expect(results.errors.length).toEqual(0);
+					done();
+				});
 		}, 10000);
 
 	});
@@ -83,11 +83,11 @@ describe('Smoke Tests of the Smoke', () => {
 				};
 			});
 			return smoke.run()
-			.then((results) => {
-				expect(results.passed.length).toEqual(1);
-				expect(results.failed.length).toEqual(0);
-				done();
-			});
+				.then((results) => {
+					expect(results.passed.length).toEqual(1);
+					expect(results.failed.length).toEqual(0);
+					done();
+				});
 		});
 
 	});