Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Commit

Permalink
Fixes for code review comments. Updated eslint configuration.
Browse files Browse the repository at this point in the history
Jevgenijus Marinuskinas committed Nov 24, 2020
1 parent 174be67 commit 2ce8aba
Showing 3 changed files with 24 additions and 21 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@ module.exports = {
"space-before-blocks": [
"error",
"always"
]
],
"space-infix-ops": [
"error",
{ "int32Hint": false }
]
}
};
25 changes: 14 additions & 11 deletions example/tests/helpers.test.js
Original file line number Diff line number Diff line change
@@ -86,23 +86,26 @@ describe("Helpers", () => {
expect(newPage._timeoutSettings.timeout()).toEqual(config.defaultTimeout);
});

it("should generate random text without numbers", async () => {
it("should generate random text with no characters specified", async () => {
//Arrange, Act
const text = await Helpers.generateRandomText(8, false);
const regex = /[^A-Za-z]/;
const text = await Helpers.generateRandomText(10);
const regex = /^[A-Za-z0-9]+$/;

//Assert
expect(regex.test(text)).toBeFalsy();
expect(text.length).toEqual(8);
expect(regex.test(text)).toBeTruthy();
expect(text.length).toEqual(10);
});

it("should generate random text with numbers", async () => {
//Arrange, Act
const text = await Helpers.generateRandomText(10, true);
const regex = /[^A-Za-z0-9]/;
it("should generate random text with custom characters list", async () => {
//Arrange
const chars = "0123456789";
const regex = /^[0-9]+$/;

//Act
const text = await Helpers.generateRandomText(8, chars);

//Assert
expect(regex.test(text)).toBeFalsy();
expect(text.length).toEqual(10);
expect(regex.test(text)).toBeTruthy();
expect(text.length).toEqual(8);
});
});
14 changes: 5 additions & 9 deletions framework/helpers.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ const fs = require("fs");
const retry = require("async-retry");
const config = require(process.cwd() + "/framework.config");
const defaultTimeout = config.defaultTimeout;
const defaultCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";

class Helpers {
async takeScreenshot(filename) {
@@ -28,8 +29,7 @@ class Helpers {

async goToUrlAndLoad(url, timeout = defaultTimeout) {
await page.goto(url, {
waitUntil: "networkidle0",
timeout: timeout,
waitUntil: "networkidle0", timeout: timeout,
});
}

@@ -40,23 +40,19 @@ class Helpers {
}

async pageSetup(page) {
const environment = require(process.cwd() +
"/test-environment/environment.js");
const environment = require(process.cwd() + "/test-environment/environment.js");
await environment.prototype.pageSetup(page);
}

async generateRandomText(length, withNumbers) {
async generateRandomText(length, characters = defaultCharacters) {
var result = "";
var characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
if (withNumbers) {
characters += "0123456789";
}
var charactersLength = characters.length;
for (var i = 0; i < length; i++) {
result += characters.charAt(
Math.floor(Math.random() * charactersLength)
);
}
console.log(`Generated a random text: ${result}`);
return result;
}
}

0 comments on commit 2ce8aba

Please sign in to comment.