-
+
Current travis build:
-
+
Current npm version:
@@ -25,41 +25,51 @@
-
+
+
### **Automated testing framework**
Kakunin is a Protractor extension created by The Software House sp. z o.o. and Takamol Holding. It allows you to write e2e test scenarios with a help of Gherkin language and JavaScript for all kind of applications - Angular, React and others.
------
+---
### **Key Features:**
+
1. E2E testing
-2. Performance testing
+2. Performance testing
3. Parallel testing
-4. Cross browser testing
+4. Cross browser testing
5. Reports
------
+---
### **Documentation:**
+
You can find documentation on the **[official page](https://kakunin.io)**.
------
+---
+
### **Contributing:**
+
Feel free to contribute to this project! Just fork the code, make any updated and let us know!
------
+---
+
### **Issues:**
+
If you notice any issues while using, let as know on **[github](https://github.com/TheSoftwareHouse/Kakunin/issues)**.
Security issues, please sent on email
------
+---
+
### **You may also like our other projects:**
-* **[Babelsheet-js](https://github.com/TheSoftwareHouse/babelsheet-js)**
-* **[Fogger](https://github.com/TheSoftwareHouse/fogger)**
------
+- **[Babelsheet-js](https://github.com/TheSoftwareHouse/babelsheet-js)**
+- **[Fogger](https://github.com/TheSoftwareHouse/fogger)**
+
+---
+
### **About us:**
diff --git a/src/cli.js b/src/cli.ts
similarity index 62%
rename from src/cli.js
rename to src/cli.ts
index 0d0be076..b6b48a8b 100644
--- a/src/cli.js
+++ b/src/cli.ts
@@ -1,12 +1,12 @@
#!/usr/bin/env node
+import * as path from 'path';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as childProcess from 'child_process';
+import * as envfile from 'node-env-file';
+import { createTagsCLIArgument, filterCLIArguments, getConfigPath, isInitCommand } from './core/cli/cli.helper';
import initializer from './core/cli/initializer';
-import { isInitCommand, getConfigPath, createTagsCLIArgument, filterCLIArguments } from './core/cli/cli.helper';
-
const commandArgs = require('minimist')(process.argv.slice(2));
-const path = require('path');
-const childProcess = require('child_process');
-const envfile = require('node-env-file');
-const os = require('os');
envfile(process.cwd() + '/.env', { raise: false, overwrite: false });
@@ -29,6 +29,24 @@ if (isInitCommand(process.argv)) {
const protractorExecutable = os.platform() === 'win32' ? 'protractor.cmd' : 'protractor';
+ if (
+ !fs.existsSync(
+ path.join(
+ process.cwd(),
+ 'node_modules',
+ 'protractor',
+ 'node_modules',
+ 'webdriver-manager',
+ 'selenium',
+ 'update-config.json'
+ )
+ )
+ ) {
+ childProcess.execSync(
+ path.join(process.cwd(), 'node_modules', '.bin', 'webdriver-manager update --ie --versions.standalone=3.14.0')
+ );
+ }
+
childProcess
.spawn(path.join('node_modules', '.bin', protractorExecutable), argv, {
stdio: 'inherit',
diff --git a/src/comparators/comparator.interface.ts b/src/comparators/comparator.interface.ts
new file mode 100644
index 00000000..30966c7a
--- /dev/null
+++ b/src/comparators/comparator.interface.ts
@@ -0,0 +1,4 @@
+export interface Comparator {
+ isSatisfiedBy(value: any[]): boolean;
+ compare(values: any[], order: string): Promise;
+}
diff --git a/src/comparators/comparator/date.comparator.spec.js b/src/comparators/comparator/date.comparator.spec.ts
similarity index 100%
rename from src/comparators/comparator/date.comparator.spec.js
rename to src/comparators/comparator/date.comparator.spec.ts
diff --git a/src/comparators/comparator/date.comparator.js b/src/comparators/comparator/date.comparator.ts
similarity index 82%
rename from src/comparators/comparator/date.comparator.js
rename to src/comparators/comparator/date.comparator.ts
index 56efd3bd..4efbd6ab 100644
--- a/src/comparators/comparator/date.comparator.js
+++ b/src/comparators/comparator/date.comparator.ts
@@ -1,10 +1,11 @@
-import moment from 'moment';
+import * as moment from 'moment';
+import { Comparator } from '../comparator.interface';
export const supportedFormats = ['DD-MM-YYYY', 'DD-MM-YY', 'DD/MM/YYYY', 'DD/MM/YY'];
const isValidDate = date => {
- for (let index = 0; index < supportedFormats.length; index++) {
- if (moment(date, supportedFormats[index]).isValid()) {
+ for (const format of supportedFormats) {
+ if (moment(date, format).isValid()) {
return true;
}
}
@@ -12,10 +13,9 @@ const isValidDate = date => {
return false;
};
-export const DateComparator = {
+export const DateComparator: Comparator = {
isSatisfiedBy: values => {
- for (let i = 0; i < values.length; i++) {
- const date = values[i];
+ for (const date of values) {
const found = isValidDate(date);
if (!found) {
diff --git a/src/comparators/comparator/index.js b/src/comparators/comparator/index.ts
similarity index 100%
rename from src/comparators/comparator/index.js
rename to src/comparators/comparator/index.ts
diff --git a/src/comparators/comparator/number.comparator.spec.js b/src/comparators/comparator/number.comparator.spec.ts
similarity index 100%
rename from src/comparators/comparator/number.comparator.spec.js
rename to src/comparators/comparator/number.comparator.spec.ts
diff --git a/src/comparators/comparator/number.comparator.js b/src/comparators/comparator/number.comparator.ts
similarity index 79%
rename from src/comparators/comparator/number.comparator.js
rename to src/comparators/comparator/number.comparator.ts
index 6149f39c..8f1c8c22 100644
--- a/src/comparators/comparator/number.comparator.js
+++ b/src/comparators/comparator/number.comparator.ts
@@ -1,8 +1,10 @@
-export const NumberComparator = {
+import { Comparator } from '../comparator.interface';
+
+export const NumberComparator: Comparator = {
isSatisfiedBy: values => {
- for (let i = 0; i < values.length; i++) {
- const value = Number(values[i]);
- if (Number.isNaN(value)) {
+ for (const value of values) {
+ const numberValue = Number(value);
+ if (Number.isNaN(numberValue)) {
return false;
}
}
diff --git a/src/comparators/comparators.spec.js b/src/comparators/comparators.spec.ts
similarity index 100%
rename from src/comparators/comparators.spec.js
rename to src/comparators/comparators.spec.ts
diff --git a/src/comparators/comparators.js b/src/comparators/comparators.ts
similarity index 56%
rename from src/comparators/comparators.js
rename to src/comparators/comparators.ts
index 03b8de8d..d917fa13 100644
--- a/src/comparators/comparators.js
+++ b/src/comparators/comparators.ts
@@ -1,11 +1,12 @@
import * as comparators from './comparator';
+import { Comparator } from './comparator.interface';
class Comparators {
- constructor() {
- this.availableComparators = [comparators.DateComparator, comparators.NumberComparator];
- }
+ constructor(
+ private availableComparators: Comparator[] = [comparators.DateComparator, comparators.NumberComparator]
+ ) {}
- compare(values, order) {
+ public compare(values: any[], order: string): Promise {
const comparator = this.findComparator(values);
if (comparator === undefined) {
@@ -15,11 +16,11 @@ class Comparators {
return comparator.compare(values, order);
}
- findComparator(values) {
+ public findComparator(values: any[]): Comparator {
return this.availableComparators.find(comparator => comparator.isSatisfiedBy(values));
}
- addComparator(comparator) {
+ public addComparator(comparator: Comparator): void {
this.availableComparators.push(comparator);
}
}
diff --git a/src/comparators/index.js b/src/comparators/index.ts
similarity index 100%
rename from src/comparators/index.js
rename to src/comparators/index.ts
diff --git a/src/core/cli/cli.helper.spec.js b/src/core/cli/cli.helper.spec.ts
similarity index 96%
rename from src/core/cli/cli.helper.spec.js
rename to src/core/cli/cli.helper.spec.ts
index 3e7dfff1..b8d34f14 100644
--- a/src/core/cli/cli.helper.spec.js
+++ b/src/core/cli/cli.helper.spec.ts
@@ -26,7 +26,7 @@ describe('Cli helpers', () => {
});
it('returns config path by config file', () => {
- expect(getConfigPath('some-file.config.js', 'other-config.js', '/my/path')).toEqual('/my/path/other-config.js');
+ expect(getConfigPath('some-file.config.js', 'other-config.ts', '/my/path')).toEqual('/my/path/other-config.ts');
});
it('creates empty tags cli argument if neither performance nor tags param is defined', () => {
diff --git a/src/core/cli/cli.helper.js b/src/core/cli/cli.helper.ts
similarity index 95%
rename from src/core/cli/cli.helper.js
rename to src/core/cli/cli.helper.ts
index fdc48a67..4b14ee9f 100644
--- a/src/core/cli/cli.helper.js
+++ b/src/core/cli/cli.helper.ts
@@ -1,6 +1,6 @@
import * as path from 'path';
-export const isInitCommand = args => {
+export const isInitCommand = (args?: any[] | string) => {
if (Array.isArray(args)) {
return args.length > 2 && args[2] === 'init';
}
diff --git a/src/core/cli/initializer.js b/src/core/cli/initializer.ts
similarity index 92%
rename from src/core/cli/initializer.js
rename to src/core/cli/initializer.ts
index 675d4f50..2ce4e1c0 100644
--- a/src/core/cli/initializer.js
+++ b/src/core/cli/initializer.ts
@@ -1,20 +1,18 @@
-import inquirer from 'inquirer';
-import mkdirp from 'mkdirp';
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as inquirer from 'inquirer';
+import * as mkdirp from 'mkdirp';
+import * as path from 'path';
class Initializer {
- // eslint-disable-next-line class-methods-use-this
- createProjectDirectory(dirPath) {
+ public createProjectDirectory(dirPath) {
const projectPath = process.cwd() + dirPath;
- mkdirp(projectPath);
+ mkdirp(projectPath, null);
console.log(`Created directory at path ${projectPath}`);
}
- // eslint-disable-next-line class-methods-use-this
- createTemplateFile(templatePath, content) {
+ public createTemplateFile(templatePath, content) {
const filePath = process.cwd() + templatePath;
fs.writeFileSync(filePath, content);
@@ -22,14 +20,13 @@ class Initializer {
console.log(`Created file at path ${filePath}`);
}
- createTemplateFileWithContentFrom(contentPath, file) {
+ public createTemplateFileWithContentFrom(contentPath, file) {
const content = fs.readFileSync(path.join(__dirname, `../../../templates/${file}`));
this.createTemplateFile(contentPath, content);
}
- // eslint-disable-next-line class-methods-use-this
- async promptFolders(message, defaultValue, type = 'input') {
+ public async promptFolders(message, defaultValue, type = 'input') {
let fullMessage = message;
if (defaultValue !== '') {
@@ -39,18 +36,17 @@ class Initializer {
return inquirer
.prompt([
{
- type: type,
+ type,
name: 'input',
message: fullMessage,
},
])
- .then(function(answer) {
- return answer.input === '' ? defaultValue : answer.input;
- });
+ .then((answer: any): any => (answer.input === '' ? defaultValue : answer.input));
}
- async initConfig(commandArgs) {
+ public async initConfig(commandArgs) {
const conf = {
+ baseUrl: '',
type: 'otherWeb',
browserWidth: 1600,
browserHeight: 900,
@@ -81,6 +77,8 @@ class Initializer {
email: null,
headless: false,
noGpu: false,
+ browserMob: null,
+ accounts: null,
};
if (typeof commandArgs.baseUrl === 'undefined') {
@@ -103,7 +101,7 @@ class Initializer {
],
},
])
- .then(function(answer) {
+ .then((answer: any) => {
if (answer.type !== 'none') {
conf.email = {
type: answer.type,
@@ -221,7 +219,7 @@ class Initializer {
this.createTemplateFile('/kakunin.conf.js', 'module.exports = ' + JSON.stringify(conf, null, 4));
}
- async initEnv() {
+ public async initEnv() {
const envs = [];
envs.push('FIXTURES_RELOAD_HOST=' + (await this.promptFolders('Define FIXTURES_RELOAD_HOST', '')));
@@ -229,10 +227,8 @@ class Initializer {
this.createTemplateFile('/.env', envs.join('\n'));
}
- async generateProjectStructure() {
- /* eslint-disable */
+ public async generateProjectStructure() {
const config = require(process.cwd() + '/kakunin.conf.js');
- /* eslint-enable */
this.createProjectDirectory(config.reports);
this.createProjectDirectory(path.join(config.reports, 'report'));
diff --git a/src/core/config.helper.js b/src/core/config.helper.ts
similarity index 89%
rename from src/core/config.helper.js
rename to src/core/config.helper.ts
index c5d70701..0bd0aec4 100644
--- a/src/core/config.helper.js
+++ b/src/core/config.helper.ts
@@ -15,7 +15,7 @@ if (process.env.NODE_ENV === 'test') {
const project = process.argv.find(name => name.indexOf('--projectPath') >= 0);
const projectPath = project.substr(project.indexOf('=') + 1);
- config = require(configFilePath); // eslint-disable-line global-require
+ config = require(configFilePath);
config.projectPath = projectPath;
config.performance = commandArgs.performance || false;
}
diff --git a/src/core/fs/delete-files.helper.js b/src/core/fs/delete-files.helper.ts
similarity index 81%
rename from src/core/fs/delete-files.helper.js
rename to src/core/fs/delete-files.helper.ts
index e21bdede..61f38ee1 100644
--- a/src/core/fs/delete-files.helper.js
+++ b/src/core/fs/delete-files.helper.ts
@@ -1,5 +1,5 @@
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
export const deleteReports = directory => {
return fs
diff --git a/src/core/fs/prepare-catalogs.helper.js b/src/core/fs/prepare-catalogs.helper.js
deleted file mode 100644
index 09a93b80..00000000
--- a/src/core/fs/prepare-catalogs.helper.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import fs from 'fs';
-import mkdirp from 'mkdirp';
-
-export const prepareCatalogs = async directory => {
- if (fs.existsSync(directory)) {
- return Promise.resolve();
- }
-
- await mkdirp(directory);
- await console.log(`${directory} has been added!`);
- await fs.writeFileSync(`${directory}/.gitkeep`, '');
-};
diff --git a/src/core/fs/prepare-catalogs.helper.ts b/src/core/fs/prepare-catalogs.helper.ts
new file mode 100644
index 00000000..959032da
--- /dev/null
+++ b/src/core/fs/prepare-catalogs.helper.ts
@@ -0,0 +1,12 @@
+import * as fs from 'fs';
+import * as mkdirp from 'mkdirp';
+
+export const prepareCatalogs = directory => {
+ if (fs.existsSync(directory)) {
+ return Promise.resolve();
+ }
+
+ mkdirp(directory, null);
+ console.log(`${directory} has been added!`);
+ fs.writeFileSync(`${directory}/.gitkeep`, '');
+};
diff --git a/src/core/modules-loader.helper.js b/src/core/modules-loader.helper.ts
similarity index 75%
rename from src/core/modules-loader.helper.js
rename to src/core/modules-loader.helper.ts
index 33edc011..d0781528 100644
--- a/src/core/modules-loader.helper.js
+++ b/src/core/modules-loader.helper.ts
@@ -1,8 +1,10 @@
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
import config from './config.helper';
class ModulesLoader {
+ private paths: any;
+
constructor(configuration) {
this.paths = {
comparators: [],
@@ -13,6 +15,7 @@ class ModulesLoader {
regexes: [],
transformers: [],
emails: [],
+ hooks: [],
};
Object.keys(this.paths).forEach(group => {
@@ -24,25 +27,22 @@ class ModulesLoader {
});
}
- getModules(group) {
- return this.getFilePaths(this.paths[group]).map(
- file => require(file[1]) // eslint-disable-line global-require
- );
+ public getModules(group) {
+ return this.getFilePaths(this.paths[group]).map(file => require(file[1]));
}
- getModulesAsObject(projectFolders) {
+ public getModulesAsObject(projectFolders) {
const modules = {};
const filePaths = this.getFilePaths(projectFolders);
filePaths.forEach(file => {
- modules[file[0]] = require(file[1]); // eslint-disable-line global-require
+ modules[file[0]] = require(file[1]);
});
return modules;
}
- // eslint-disable-next-line class-methods-use-this
- getFilePaths(folders) {
+ public getFilePaths(folders) {
let files = [];
folders.forEach(folder => {
diff --git a/src/core/prototypes.js b/src/core/prototypes.js
deleted file mode 100644
index f79ee30d..00000000
--- a/src/core/prototypes.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// eslint-disable-next-line no-extend-native
-String.prototype.toCamelCase = function() {
- return this.charAt(0).toUpperCase() + this.slice(1);
-};
-
-RegExp.escape = function(text) {
- return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-};
diff --git a/src/core/prototypes.ts b/src/core/prototypes.ts
new file mode 100644
index 00000000..6dbd1a90
--- /dev/null
+++ b/src/core/prototypes.ts
@@ -0,0 +1,3 @@
+RegExp.escape = (text): string => {
+ return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+};
diff --git a/src/dictionaries/base.js b/src/dictionaries/base.js
deleted file mode 100644
index 8b48f7bf..00000000
--- a/src/dictionaries/base.js
+++ /dev/null
@@ -1,16 +0,0 @@
-class Dictionary {
- constructor(dictionaryName, valuesObject) {
- this.values = valuesObject;
- this.name = dictionaryName;
- }
-
- isSatisfiedBy(name) {
- return this.name === name;
- }
-
- getMappedValue(key) {
- return this.values[key];
- }
-}
-
-export default Dictionary;
diff --git a/src/dictionaries/base.ts b/src/dictionaries/base.ts
new file mode 100644
index 00000000..47658778
--- /dev/null
+++ b/src/dictionaries/base.ts
@@ -0,0 +1,19 @@
+class BaseDictionary {
+ public readonly name: string;
+ public readonly values: object;
+
+ constructor(name, values) {
+ this.name = name;
+ this.values = values;
+ }
+
+ public isSatisfiedBy(name: string): boolean {
+ return this.name === name;
+ }
+
+ public getMappedValue(key: string): string {
+ return this.values[key];
+ }
+}
+
+export default BaseDictionary;
diff --git a/src/dictionaries/dictionaries.spec.js b/src/dictionaries/dictionaries.spec.ts
similarity index 77%
rename from src/dictionaries/dictionaries.spec.js
rename to src/dictionaries/dictionaries.spec.ts
index bc9c4c9b..948efeeb 100644
--- a/src/dictionaries/dictionaries.spec.js
+++ b/src/dictionaries/dictionaries.spec.ts
@@ -1,5 +1,5 @@
-import { create } from './dictionaries';
-import fakeDictionary from '../tests/dictionaries/fake-dictionary';
+import { createDictionary as create, Base as BaseDictionary } from './';
+import fakeDictionary = require('../tests/dictionaries/fake-dictionary');
const dictionaries = create();
@@ -21,10 +21,7 @@ describe('Dictionaries', () => {
});
it('adds a dictionary', () => {
- const customDictionary = {
- isSatisfiedBy: name => name === 'my-dictionary',
- getMappedValue: key => `mapped-${key}`,
- };
+ const customDictionary = new BaseDictionary('my-dictionary', { 'some-key': 'mapped-some-key' });
dictionaries.addDictionary(customDictionary);
diff --git a/src/dictionaries/dictionaries.js b/src/dictionaries/dictionaries.ts
similarity index 64%
rename from src/dictionaries/dictionaries.js
rename to src/dictionaries/dictionaries.ts
index df183b09..decffa4a 100644
--- a/src/dictionaries/dictionaries.js
+++ b/src/dictionaries/dictionaries.ts
@@ -1,9 +1,9 @@
-class Dictionaries {
- constructor() {
- this.availableDictionaries = [];
- }
+import Dictionary from './base';
+
+export class Dictionaries {
+ constructor(private availableDictionaries: Dictionary[] = []) {}
- getMappedValue(dictionaryName, key) {
+ public getMappedValue(dictionaryName: string, key: string): string {
const dic = this.findDictionary(dictionaryName);
if (dic === undefined) {
@@ -13,11 +13,11 @@ class Dictionaries {
return dic.getMappedValue(key);
}
- findDictionary(name) {
+ public findDictionary(name: string): Dictionary {
return this.availableDictionaries.find(dic => dic.isSatisfiedBy(name));
}
- findMappedValueByPhrase(phrase) {
+ public findMappedValueByPhrase(phrase: string): string {
const parameters = phrase.split(':');
if (parameters[0] === 'd') {
const dictionary = this.findDictionary(parameters[1]);
@@ -30,7 +30,7 @@ class Dictionaries {
return phrase;
}
- addDictionary(dictionary) {
+ public addDictionary(dictionary: Dictionary): void {
this.availableDictionaries.push(dictionary);
}
}
diff --git a/src/dictionaries/index.js b/src/dictionaries/index.ts
similarity index 63%
rename from src/dictionaries/index.js
rename to src/dictionaries/index.ts
index be7fa181..18556e74 100644
--- a/src/dictionaries/index.js
+++ b/src/dictionaries/index.ts
@@ -1,5 +1,7 @@
-import { create } from './dictionaries';
import BaseDictionary from './base';
+import { create } from './dictionaries';
+export { Dictionaries } from './dictionaries';
+export const createDictionary = create;
export const dictionaries = create();
export const Base = BaseDictionary;
diff --git a/src/emails/adapter/mailtrap.client.spec.js b/src/emails/adapter/mailtrap.client.spec.ts
similarity index 98%
rename from src/emails/adapter/mailtrap.client.spec.js
rename to src/emails/adapter/mailtrap.client.spec.ts
index e2c202fc..45c1de64 100644
--- a/src/emails/adapter/mailtrap.client.spec.js
+++ b/src/emails/adapter/mailtrap.client.spec.ts
@@ -1,5 +1,5 @@
import { create } from './mailtrap.client';
-import fetchMock from 'fetch-mock';
+import * as fetchMock from 'fetch-mock';
describe('Mailtrap client', () => {
it('it returns mailtrap config', () => {
diff --git a/src/emails/adapter/mailtrap.client.js b/src/emails/adapter/mailtrap.client.ts
similarity index 90%
rename from src/emails/adapter/mailtrap.client.js
rename to src/emails/adapter/mailtrap.client.ts
index d680bd5f..20b48e25 100644
--- a/src/emails/adapter/mailtrap.client.js
+++ b/src/emails/adapter/mailtrap.client.ts
@@ -1,13 +1,16 @@
-import fetch from 'node-fetch';
+import * as fetch from 'node-fetch';
import configuration from '../../core/config.helper';
class MailTrapClient {
+ private requestClient: any;
+ private config: any;
+
constructor(requestClient, config) {
this.requestClient = requestClient;
this.config = config;
}
- isSatisfiedBy(emailConfiguration) {
+ public isSatisfiedBy(emailConfiguration) {
return (
emailConfiguration.type === 'mailtrap' &&
emailConfiguration.config.hasOwnProperty('apiKey') &&
@@ -16,7 +19,7 @@ class MailTrapClient {
);
}
- getMailtrapConfig() {
+ public getMailtrapConfig() {
return {
apiKey: this.config.config.apiKey,
inboxId: this.config.config.inboxId,
@@ -24,7 +27,7 @@ class MailTrapClient {
};
}
- clearInbox() {
+ public clearInbox() {
const config = this.getMailtrapConfig();
const url = `${config.endpoint}/api/v1/inboxes/${config.inboxId}/clean?api_token=${config.apiKey}`;
@@ -39,7 +42,7 @@ class MailTrapClient {
});
}
- async getEmails() {
+ public async getEmails() {
const config = this.getMailtrapConfig();
const url = `${config.endpoint}/api/v1/inboxes/${config.inboxId}/messages?api_token=${config.apiKey}`;
@@ -67,7 +70,7 @@ class MailTrapClient {
return messagesWithBody.filter(message => !message.is_read);
}
- getAttachments(email) {
+ public getAttachments(email) {
const config = this.getMailtrapConfig();
const url = `${config.endpoint}/api/v1/inboxes/${config.inboxId}/messages/${email.id}/attachments?api_token=${
config.apiKey
@@ -82,7 +85,7 @@ class MailTrapClient {
});
}
- markAsRead(email) {
+ public markAsRead(email) {
const config = this.getMailtrapConfig();
const url = `${config.endpoint}/api/v1/inboxes/${config.inboxId}/messages/${email.id}?api_token=${config.apiKey}`;
diff --git a/src/emails/email.service.spec.js b/src/emails/email.service.spec.ts
similarity index 98%
rename from src/emails/email.service.spec.js
rename to src/emails/email.service.spec.ts
index 2fd81dd9..1f8fedf6 100644
--- a/src/emails/email.service.spec.js
+++ b/src/emails/email.service.spec.ts
@@ -3,7 +3,7 @@ import { create } from './email.service';
describe('Email service', () => {
it('it returns adapter if found', () => {
const fakeAdapter = {
- isSatisfiedBy: config => true,
+ isSatisfiedBy: (config: any) => true,
};
const fakeConfig = {
diff --git a/src/emails/email.service.js b/src/emails/email.service.ts
similarity index 75%
rename from src/emails/email.service.js
rename to src/emails/email.service.ts
index 3b265824..65a7ff1d 100644
--- a/src/emails/email.service.js
+++ b/src/emails/email.service.ts
@@ -1,42 +1,45 @@
import configuration from '../core/config.helper';
-import { create as createMailtrapAdapter } from './adapter/mailtrap.client.js';
+import { create as createMailtrapAdapter } from './adapter/mailtrap.client';
class EmailService {
+ private config: any;
+ private availableAdapters: any;
+
constructor(config, defaultAdapters) {
this.config = config;
this.availableAdapters = defaultAdapters;
}
- clearInbox() {
+ public clearInbox() {
const adapter = this.getAdapter();
return adapter.clearInbox();
}
- getEmails() {
+ public getEmails() {
const adapter = this.getAdapter();
return adapter.getEmails();
}
- getAttachments(email) {
+ public getAttachments(email) {
const adapter = this.getAdapter();
return adapter.getAttachments(email);
}
- markAsRead(email) {
+ public markAsRead(email) {
const adapter = this.getAdapter();
return adapter.markAsRead(email);
}
- addAdapter(adapter) {
+ public addAdapter(adapter) {
this.availableAdapters.push(adapter);
}
- getAdapter() {
+ public getAdapter() {
const emailAdapter = this.availableAdapters.find(adapter => adapter.isSatisfiedBy(this.config.email));
if (emailAdapter === undefined) {
@@ -49,6 +52,6 @@ class EmailService {
const mailtrapAdapter = createMailtrapAdapter();
-export const create = (defaultAdapters = [mailtrapAdapter], config = configuration) => {
+export const create = (defaultAdapters: any = [mailtrapAdapter], config = configuration) => {
return new EmailService(config, defaultAdapters);
};
diff --git a/src/emails/filter/current-user.filter.js b/src/emails/filter/current-user.filter.ts
similarity index 79%
rename from src/emails/filter/current-user.filter.js
rename to src/emails/filter/current-user.filter.ts
index 749b7ff2..39ddafa3 100644
--- a/src/emails/filter/current-user.filter.js
+++ b/src/emails/filter/current-user.filter.ts
@@ -1,11 +1,11 @@
// TODO: stop injecting world here and use some kind of a user provider
class CurrentUserFilter {
- isSatisfiedBy(type) {
+ public isSatisfiedBy(type) {
return type === 'currentUser';
}
- filter(emails, type, value, world) {
+ public filter(emails, type, value, world) {
return emails.filter(email => email.to_email === world.currentUser.account.email);
}
}
diff --git a/src/emails/filter/current-user.spec.js b/src/emails/filter/current-user.spec.ts
similarity index 93%
rename from src/emails/filter/current-user.spec.js
rename to src/emails/filter/current-user.spec.ts
index e429a65b..c27bce79 100644
--- a/src/emails/filter/current-user.spec.js
+++ b/src/emails/filter/current-user.spec.ts
@@ -1,4 +1,4 @@
-import { currentUserFilter } from './current-user.filter';
+const { currentUserFilter } = require('./current-user.filter');
const fakeWorld = {
currentUser: {
diff --git a/src/emails/filter/index.js b/src/emails/filter/index.ts
similarity index 100%
rename from src/emails/filter/index.js
rename to src/emails/filter/index.ts
diff --git a/src/emails/filter/minimal-email-size.filter.spec.js b/src/emails/filter/minimal-email-size.filter.spec.ts
similarity index 90%
rename from src/emails/filter/minimal-email-size.filter.spec.js
rename to src/emails/filter/minimal-email-size.filter.spec.ts
index 3eec4284..ea360d6a 100644
--- a/src/emails/filter/minimal-email-size.filter.spec.js
+++ b/src/emails/filter/minimal-email-size.filter.spec.ts
@@ -1,4 +1,4 @@
-import { minimalEmailSizeFilter } from './minimal-email-size.filter.js';
+const { minimalEmailSizeFilter } = require('./minimal-email-size.filter.ts');
describe('Minimal email size filter', () => {
it('returns true when can be use', () => {
diff --git a/src/emails/filter/minimal-email-size.filter.js b/src/emails/filter/minimal-email-size.filter.ts
similarity index 67%
rename from src/emails/filter/minimal-email-size.filter.js
rename to src/emails/filter/minimal-email-size.filter.ts
index b33cd702..d78ad721 100644
--- a/src/emails/filter/minimal-email-size.filter.js
+++ b/src/emails/filter/minimal-email-size.filter.ts
@@ -1,10 +1,9 @@
class MinimalEmailSizeFilter {
- isSatisfiedBy(type) {
+ public isSatisfiedBy(type) {
return type === 'minimalEmailSize';
}
- // eslint-disable-next-line no-unused-vars
- filter(emails, type, value, world) {
+ public filter(emails, type, value) {
return emails.filter(email => email.email_size >= parseInt(value));
}
}
diff --git a/src/emails/filter/text-fields.filter.spec.js b/src/emails/filter/text-fields.filter.spec.ts
similarity index 100%
rename from src/emails/filter/text-fields.filter.spec.js
rename to src/emails/filter/text-fields.filter.spec.ts
diff --git a/src/emails/filter/text-fields.filter.js b/src/emails/filter/text-fields.filter.ts
similarity index 76%
rename from src/emails/filter/text-fields.filter.js
rename to src/emails/filter/text-fields.filter.ts
index de5cbaf5..07a25046 100644
--- a/src/emails/filter/text-fields.filter.js
+++ b/src/emails/filter/text-fields.filter.ts
@@ -2,12 +2,11 @@ import { regexBuilder } from '../../matchers';
import variableStore from '../../web/variable-store.helper';
class TextFieldFilter {
- isSatisfiedBy(type) {
+ public isSatisfiedBy(type) {
return ['subject', 'from_email', 'from_name', 'to_email', 'to_name', 'html_body', 'text_body'].indexOf(type) !== -1;
}
- // eslint-disable-next-line no-unused-vars
- filter(emails, type, value, world) {
+ public filter(emails, type, value) {
return emails.filter(email => {
if (value.startsWith('r:')) {
return regexBuilder.buildRegex(value).test(email[type]);
@@ -17,7 +16,7 @@ class TextFieldFilter {
return new RegExp(RegExp.escape(variableStore.replaceTextVariables(value.substr(2)))).test(email[type]);
}
- throw 'Comparison type not specified. Please use r: for regex and t: for text';
+ throw new Error('Comparison type not specified. Please use r: for regex and t: for text');
});
}
}
diff --git a/src/emails/filters.spec.js b/src/emails/filters.spec.ts
similarity index 100%
rename from src/emails/filters.spec.js
rename to src/emails/filters.spec.ts
diff --git a/src/emails/filters.js b/src/emails/filters.ts
similarity index 84%
rename from src/emails/filters.js
rename to src/emails/filters.ts
index 922709e6..2ca937b9 100644
--- a/src/emails/filters.js
+++ b/src/emails/filters.ts
@@ -1,6 +1,8 @@
import * as defaultFilters from './filter';
class Filters {
+ private availableFilters: any;
+
constructor() {
this.availableFilters = [
defaultFilters.currentUserFilter,
@@ -9,7 +11,7 @@ class Filters {
];
}
- filter(emails, type, value, world) {
+ public filter(emails, type, value, world) {
const filter = this.findFilter(type);
if (typeof filter === 'undefined') {
@@ -19,7 +21,7 @@ class Filters {
return filter.filter(emails, type, value, world);
}
- findFilter(type) {
+ public findFilter(type) {
return this.availableFilters.find(filter => filter.isSatisfiedBy(type));
}
}
diff --git a/src/emails/index.js b/src/emails/index.ts
similarity index 100%
rename from src/emails/index.js
rename to src/emails/index.ts
diff --git a/src/form-handlers/form-handler.interface.ts b/src/form-handlers/form-handler.interface.ts
new file mode 100644
index 00000000..6d74a6d1
--- /dev/null
+++ b/src/form-handlers/form-handler.interface.ts
@@ -0,0 +1,6 @@
+export interface FormHandler {
+ isSatisfiedBy(element?: object, elementName?: string): Promise;
+ handleFill(page: object, elementName: string, desiredValue: string): Promise;
+ handleCheck(page: object, elementName: string, desiredValue: string): Promise;
+ getPriority(): number;
+}
diff --git a/src/form-handlers/handler/checkbox.handler.js b/src/form-handlers/handler/checkbox.handler.ts
similarity index 74%
rename from src/form-handlers/handler/checkbox.handler.js
rename to src/form-handlers/handler/checkbox.handler.ts
index 9c38c43b..116080b0 100644
--- a/src/form-handlers/handler/checkbox.handler.js
+++ b/src/form-handlers/handler/checkbox.handler.ts
@@ -1,5 +1,7 @@
-class CheckboxHandler {
- isSatisfiedBy(element) {
+import { FormHandler } from '../form-handler.interface';
+
+class CheckboxHandler implements FormHandler {
+ public isSatisfiedBy(element) {
return element.getTagName().then(tagName => {
if (tagName === 'input') {
return element.getAttribute('type').then(inputType => inputType === 'checkbox');
@@ -16,8 +18,9 @@ class CheckboxHandler {
});
}
- handleFill(page, elementName, desiredValue) {
- return page[elementName]
+ public handleFill(page, elementName, desiredValue) {
+ return page
+ .getElements(elementName)
.filter(elem => {
return elem
.element(by.xpath('..'))
@@ -30,8 +33,8 @@ class CheckboxHandler {
.click();
}
- handleCheck(page, elementName, desiredValue) {
- const filteredElements = page[elementName].filter(element => element.isSelected());
+ public handleCheck(page, elementName, desiredValue) {
+ const filteredElements = page.getElements(elementName).filter(element => element.isSelected());
return filteredElements.count().then(count => {
if (desiredValue === '') {
@@ -42,7 +45,8 @@ class CheckboxHandler {
return Promise.reject(`Expected count to be 0 got ${count}`);
}
- return page[elementName]
+ return page
+ .getElements(elementName)
.filter(element => {
return element
.element(by.xpath('..'))
@@ -63,7 +67,7 @@ class CheckboxHandler {
});
}
- getPriority() {
+ public getPriority() {
return 998;
}
}
diff --git a/src/form-handlers/handler/ckeditor.handler.js b/src/form-handlers/handler/ckeditor.handler.ts
similarity index 60%
rename from src/form-handlers/handler/ckeditor.handler.js
rename to src/form-handlers/handler/ckeditor.handler.ts
index fe7b8582..88951d84 100644
--- a/src/form-handlers/handler/ckeditor.handler.js
+++ b/src/form-handlers/handler/ckeditor.handler.ts
@@ -1,9 +1,11 @@
-class CKEditorHandler {
- isSatisfiedBy(element, elementName) {
+import { FormHandler } from '../form-handler.interface';
+
+class CKEditorHandler implements FormHandler {
+ public isSatisfiedBy(element, elementName) {
return Promise.resolve(elementName.endsWith('CKEditor'));
}
- handleFill(page, elementName, desiredValue) {
+ public handleFill(page, elementName, desiredValue) {
browser.switchTo().frame(page[elementName].getWebElement());
browser.driver.findElement(by.tagName('body')).sendKeys(desiredValue);
@@ -13,12 +15,11 @@ class CKEditorHandler {
return browser.waitForAngular();
}
- // eslint-disable-next-line no-unused-vars
- handleCheck(page, elementName, desiredValue) {
+ public handleCheck(page, elementName, desiredValue) {
return Promise.reject('Checking CKEditor is not supported');
}
- getPriority() {
+ public getPriority() {
return 998;
}
}
diff --git a/src/form-handlers/handler/custom-angular-select.handler.js b/src/form-handlers/handler/custom-angular-select.handler.ts
similarity index 56%
rename from src/form-handlers/handler/custom-angular-select.handler.js
rename to src/form-handlers/handler/custom-angular-select.handler.ts
index d3d65878..a3dd5ab4 100644
--- a/src/form-handlers/handler/custom-angular-select.handler.js
+++ b/src/form-handlers/handler/custom-angular-select.handler.ts
@@ -1,21 +1,26 @@
-class CustomAngularSelectHandler {
+import { FormHandler } from '../form-handler.interface';
+
+class CustomAngularSelectHandler implements FormHandler {
+ private selectedOptionSelector: object;
+ private optionsSelector: object;
+
constructor() {
this.optionsSelector = by.css('ul.ui-select-choices li a.ui-select-choices-row-inner');
this.selectedOptionSelector = by.css('div.ui-select-match .ui-select-match-text');
}
- isSatisfiedBy(element, elementName) {
+ public isSatisfiedBy(element, elementName) {
return Promise.resolve(elementName.endsWith('CustomAngularSelect'));
}
- handleFill(page, elementName, desiredValue) {
- return browser.executeScript('arguments[0].scrollIntoView(false);', page[elementName].getWebElement()).then(() => {
- return page[elementName].click().then(() => {
- const filtered = page[elementName].all(this.optionsSelector).filter(function(elem) {
- return elem.getText().then(function(text) {
- return text === desiredValue;
- });
- });
+ public handleFill(page, elementName, desiredValue) {
+ return browser
+ .executeScript('arguments[0].scrollIntoView(false);', page[elementName].getWebElement())
+ .then(() => page[elementName].click())
+ .then(() => {
+ const filtered = page[elementName]
+ .all(this.optionsSelector)
+ .filter(elem => elem.getText().then(text => text === desiredValue));
return filtered.count().then(count => {
if (count === 0) {
@@ -28,14 +33,13 @@ class CustomAngularSelectHandler {
return filtered.first().click();
});
});
- });
}
- handleCheck(page, elementName, desiredValue) {
+ public handleCheck(page, elementName, desiredValue) {
return page[elementName]
.element(this.selectedOptionSelector)
.getText()
- .then(function(text) {
+ .then(text => {
if (text === desiredValue) {
return Promise.resolve();
}
@@ -44,7 +48,7 @@ class CustomAngularSelectHandler {
});
}
- getPriority() {
+ public getPriority() {
return 998;
}
}
diff --git a/src/form-handlers/handler/default.handler.js b/src/form-handlers/handler/default.handler.js
deleted file mode 100644
index fb3ea755..00000000
--- a/src/form-handlers/handler/default.handler.js
+++ /dev/null
@@ -1,31 +0,0 @@
-class DefaultHandler {
- isSatisfiedBy() {
- return Promise.resolve(true);
- }
-
- handleFill(page, elementName, desiredValue) {
- return page[elementName].isDisplayed().then(function() {
- return page[elementName].clear().then(function() {
- return page[elementName].sendKeys(desiredValue);
- });
- });
- }
-
- handleCheck(page, elementName, desiredValue) {
- return page[elementName].isDisplayed().then(function() {
- return page[elementName].getAttribute('value').then(function(value) {
- if (value === desiredValue) {
- return Promise.resolve();
- }
-
- return Promise.reject(`Expected ${desiredValue} got ${value} for text input element ${elementName}`);
- });
- });
- }
-
- getPriority() {
- return 999;
- }
-}
-
-export const defaultHandler = new DefaultHandler();
diff --git a/src/form-handlers/handler/default.handler.ts b/src/form-handlers/handler/default.handler.ts
new file mode 100644
index 00000000..034bb262
--- /dev/null
+++ b/src/form-handlers/handler/default.handler.ts
@@ -0,0 +1,39 @@
+import { FormHandler } from '../form-handler.interface';
+
+class DefaultHandler implements FormHandler {
+ public isSatisfiedBy() {
+ return Promise.resolve(true);
+ }
+
+ public handleFill(page, elementName, desiredValue) {
+ return page
+ .getElement(elementName)
+ .isDisplayed()
+ .then(() => page.getElement(elementName).clear())
+ .then(() => page.getElement(elementName).sendKeys(desiredValue));
+ }
+
+ public handleCheck(page, elementName, desiredValue) {
+ return page
+ .getElement(elementName)
+ .isDisplayed()
+ .then(() => {
+ return page
+ .getElement(elementName)
+ .getAttribute('value')
+ .then(value => {
+ if (value === desiredValue) {
+ return Promise.resolve();
+ }
+
+ return Promise.reject(`Expected ${desiredValue} got ${value} for text input element ${elementName}`);
+ });
+ });
+ }
+
+ public getPriority() {
+ return 999;
+ }
+}
+
+export const defaultHandler = new DefaultHandler();
diff --git a/src/form-handlers/handler/file.handler.js b/src/form-handlers/handler/file.handler.js
deleted file mode 100644
index 9c24936e..00000000
--- a/src/form-handlers/handler/file.handler.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import path from 'path';
-import config from '../../core/config.helper';
-
-class FileHandler {
- isSatisfiedBy(element) {
- return element.getTagName().then(function(tagName) {
- if (tagName === 'input') {
- return element.getAttribute('type').then(inputType => inputType === 'file');
- }
-
- if (tagName instanceof Array) {
- return element
- .first()
- .getAttribute('type')
- .then(inputType => inputType === 'file');
- }
-
- return false;
- });
- }
-
- handleFill(page, elementName, desiredValue) {
- const fileToUpload = path.resolve(path.join(config.projectPath, config.data, desiredValue));
-
- return page[elementName].sendKeys(fileToUpload);
- }
-
- handleCheck(page, elementName, desiredValue) {
- return page[elementName].getText().then(function(text) {
- if (text === desiredValue) {
- return Promise.resolve();
- }
-
- return Promise.reject(`Expected ${desiredValue} got ${text} for file element ${elementName}`);
- });
- }
-
- getPriority() {
- return 998;
- }
-}
-
-export const fileHandler = new FileHandler();
diff --git a/src/form-handlers/handler/file.handler.ts b/src/form-handlers/handler/file.handler.ts
new file mode 100644
index 00000000..5203dcd7
--- /dev/null
+++ b/src/form-handlers/handler/file.handler.ts
@@ -0,0 +1,47 @@
+import * as path from 'path';
+import config from '../../core/config.helper';
+import { FormHandler } from '../form-handler.interface';
+
+class FileHandler implements FormHandler {
+ public isSatisfiedBy(element) {
+ return element.getTagName().then(tagName => {
+ if (tagName === 'input') {
+ return element.getAttribute('type').then(inputType => inputType === 'file');
+ }
+
+ if (tagName instanceof Array) {
+ return element
+ .first()
+ .getAttribute('type')
+ .then(inputType => inputType === 'file');
+ }
+
+ return false;
+ });
+ }
+
+ public handleFill(page, elementName, desiredValue) {
+ const fileToUpload = path.resolve(path.join(config.projectPath, config.data, desiredValue));
+
+ return page.getElements(elementName).sendKeys(fileToUpload);
+ }
+
+ public handleCheck(page, elementName, desiredValue) {
+ return page
+ .getElements(elementName)
+ .getText()
+ .then(text => {
+ if (text === desiredValue) {
+ return Promise.resolve();
+ }
+
+ return Promise.reject(`Expected ${desiredValue} got ${text} for file element ${elementName}`);
+ });
+ }
+
+ public getPriority() {
+ return 998;
+ }
+}
+
+export const fileHandler = new FileHandler();
diff --git a/src/form-handlers/handler/index.js b/src/form-handlers/handler/index.ts
similarity index 100%
rename from src/form-handlers/handler/index.js
rename to src/form-handlers/handler/index.ts
diff --git a/src/form-handlers/handler/radio.handler.js b/src/form-handlers/handler/radio.handler.ts
similarity index 59%
rename from src/form-handlers/handler/radio.handler.js
rename to src/form-handlers/handler/radio.handler.ts
index 1dc9c903..dbde6efa 100644
--- a/src/form-handlers/handler/radio.handler.js
+++ b/src/form-handlers/handler/radio.handler.ts
@@ -1,6 +1,8 @@
-class RadioHandler {
- isSatisfiedBy(element) {
- return element.getTagName().then(function(tagName) {
+import { FormHandler } from '../form-handler.interface';
+
+class RadioHandler implements FormHandler {
+ public isSatisfiedBy(element) {
+ return element.getTagName().then(tagName => {
if (tagName === 'input') {
return element.getAttribute('type').then(inputType => inputType === 'radio');
}
@@ -16,16 +18,13 @@ class RadioHandler {
});
}
- handleFill(page, elementName, desiredValue) {
- const firstRadio = page[elementName]
- .filter(function(elem) {
- return elem.getAttribute('value').then(function(elemValue) {
- return elemValue === desiredValue;
- });
- })
+ public handleFill(page, elementName, desiredValue) {
+ const firstRadio = page
+ .getElements(elementName)
+ .filter(elem => elem.getAttribute('value').then(elemValue => elemValue === desiredValue))
.first();
- return firstRadio.isDisplayed().then(function(isDisplayed) {
+ return firstRadio.isDisplayed().then(isDisplayed => {
if (isDisplayed) {
return firstRadio.click();
}
@@ -34,12 +33,10 @@ class RadioHandler {
});
}
- handleCheck(page, elementName, desiredValue) {
- const filteredElements = page[elementName].filter(function(element) {
- return element.isSelected();
- });
+ public handleCheck(page, elementName, desiredValue) {
+ const filteredElements = page.getElements(elementName).filter(element => element.isSelected());
- return filteredElements.count().then(function(count) {
+ return filteredElements.count().then(count => {
if (desiredValue === '') {
if (count === 0) {
return Promise.resolve();
@@ -51,7 +48,7 @@ class RadioHandler {
return filteredElements
.first()
.getAttribute('value')
- .then(function(value) {
+ .then(value => {
if (value === desiredValue) {
return Promise.resolve();
}
@@ -61,7 +58,7 @@ class RadioHandler {
});
}
- getPriority() {
+ public getPriority() {
return 998;
}
}
diff --git a/src/form-handlers/handler/select.handler.js b/src/form-handlers/handler/select.handler.js
deleted file mode 100644
index a3dc1b5c..00000000
--- a/src/form-handlers/handler/select.handler.js
+++ /dev/null
@@ -1,68 +0,0 @@
-class SelectHandler {
- constructor() {
- this.optionsSelector = by.css('option');
- }
-
- isSatisfiedBy(element) {
- return element.getTagName().then(function(tagName) {
- return tagName === 'select';
- });
- }
-
- handleFill(page, elementName, desiredValue) {
- const self = this;
-
- const filteredByText = page[elementName].all(this.optionsSelector).filter(function(elem) {
- return elem.getText().then(function(text) {
- return text.trim() === desiredValue;
- });
- });
-
- return filteredByText.count().then(filteredByTextCount => {
- if (filteredByTextCount === 0) {
- const filteredByValue = page[elementName].all(by.css('option')).filter(function(elem) {
- return elem.getAttribute('value').then(function(elemValue) {
- return elemValue === desiredValue;
- });
- });
-
- return filteredByValue.count().then(function(filteredByValueCount) {
- if (filteredByValueCount === 0) {
- return page[elementName]
- .all(self.optionsSelector)
- .first()
- .click();
- }
-
- return filteredByValue.first().click();
- });
- }
-
- return filteredByText.first().click();
- });
- }
-
- handleCheck(page, elementName, desiredValue) {
- return page[elementName]
- .all(this.optionsSelector)
- .filter(function(element) {
- return element.getAttribute('value').then(function(elemValue) {
- return elemValue === desiredValue;
- });
- })
- .count()
- .then(function(count) {
- if (count === 1) {
- return Promise.resolve();
- }
-
- return Promise.reject('Option not found for select element.');
- });
- }
-
- getPriority() {
- return 998;
- }
-}
-
-export const selectHandler = new SelectHandler();
diff --git a/src/form-handlers/handler/select.handler.ts b/src/form-handlers/handler/select.handler.ts
new file mode 100644
index 00000000..482f0ea5
--- /dev/null
+++ b/src/form-handlers/handler/select.handler.ts
@@ -0,0 +1,65 @@
+import { FormHandler } from '../form-handler.interface';
+
+class SelectHandler implements FormHandler {
+ private optionsSelector: object;
+
+ constructor() {
+ this.optionsSelector = by.css('option');
+ }
+
+ public isSatisfiedBy(element) {
+ return element.getTagName().then(tagName => tagName === 'select');
+ }
+
+ public handleFill(page, elementName, desiredValue) {
+ const self = this;
+
+ const filteredByText = page
+ .getElements(elementName)
+ .all(this.optionsSelector)
+ .filter(elem => elem.getText().then(text => text.trim() === desiredValue));
+
+ return filteredByText.count().then(filteredByTextCount => {
+ if (filteredByTextCount === 0) {
+ const filteredByValue = page
+ .getElements(elementName)
+ .all(by.css('option'))
+ .filter(elem => elem.getAttribute('value').then(elemValue => elemValue === desiredValue));
+
+ return filteredByValue.count().then(filteredByValueCount => {
+ if (filteredByValueCount === 0) {
+ return page[elementName]
+ .all(self.optionsSelector)
+ .first()
+ .click();
+ }
+
+ return filteredByValue.first().click();
+ });
+ }
+
+ return filteredByText.first().click();
+ });
+ }
+
+ public handleCheck(page, elementName, desiredValue) {
+ return page
+ .getElement(elementName)
+ .all(this.optionsSelector)
+ .filter(element => element.getAttribute('value').then(elemValue => elemValue === desiredValue))
+ .count()
+ .then(count => {
+ if (count === 1) {
+ return Promise.resolve();
+ }
+
+ return Promise.reject('Option not found for select element.');
+ });
+ }
+
+ public getPriority() {
+ return 998;
+ }
+}
+
+export const selectHandler = new SelectHandler();
diff --git a/src/form-handlers/handler/uploaded-file.handler.js b/src/form-handlers/handler/uploaded-file.handler.js
deleted file mode 100644
index 3a8801b6..00000000
--- a/src/form-handlers/handler/uploaded-file.handler.js
+++ /dev/null
@@ -1,26 +0,0 @@
-class UploadedFileHandler {
- isSatisfiedBy(element, elementName) {
- return Promise.resolve(elementName.endsWith('Uploaded'));
- }
-
- // eslint-disable-next-line no-unused-vars
- handleFill(page, elementName, desiredValue) {
- throw new Error('Not supported for this field type');
- }
-
- handleCheck(page, elementName, desiredValue) {
- return page[elementName].getText().then(function(text) {
- if (text.indexOf(desiredValue) >= 0) {
- return Promise.resolve();
- }
-
- return Promise.reject(`Expected ${desiredValue} got ${text} for file element ${elementName}`);
- });
- }
-
- getPriority() {
- return 998;
- }
-}
-
-export const uploadedFileHandler = new UploadedFileHandler();
diff --git a/src/form-handlers/handler/uploaded-file.handler.ts b/src/form-handlers/handler/uploaded-file.handler.ts
new file mode 100644
index 00000000..ad98048a
--- /dev/null
+++ b/src/form-handlers/handler/uploaded-file.handler.ts
@@ -0,0 +1,27 @@
+import { FormHandler } from '../form-handler.interface';
+
+class UploadedFileHandler implements FormHandler {
+ public isSatisfiedBy(element, elementName) {
+ return Promise.resolve(elementName.endsWith('Uploaded'));
+ }
+
+ public handleFill(page, elementName, desiredValue) {
+ return Promise.reject('Not supported for this field type');
+ }
+
+ public handleCheck(page, elementName, desiredValue) {
+ return page[elementName].getText().then(text => {
+ if (text.indexOf(desiredValue) >= 0) {
+ return Promise.resolve();
+ }
+
+ return Promise.reject(`Expected ${desiredValue} got ${text} for file element ${elementName}`);
+ });
+ }
+
+ public getPriority() {
+ return 998;
+ }
+}
+
+export const uploadedFileHandler = new UploadedFileHandler();
diff --git a/src/form-handlers/handlers.js b/src/form-handlers/handlers.js
deleted file mode 100644
index 044a52a1..00000000
--- a/src/form-handlers/handlers.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import * as formHandler from './handler';
-
-const availableHandlers = [
- formHandler.checkboxHandler,
- formHandler.ckEditorHandler,
- formHandler.customAngularSelectHandler,
- formHandler.defaultHandler,
- formHandler.fileHandler,
- formHandler.radioHandler,
- formHandler.selectHandler,
- formHandler.uploadedFileHandler,
-];
-
-const FormHandler = {
- addHandler: function(handler) {
- availableHandlers.push(handler);
- },
-
- handleFill: async function(page, elementName, desiredValue) {
- const handlers = this.getHandlers();
-
- for (let handler of handlers) {
- const isSatisfied = await handler.isSatisfiedBy(page[elementName], elementName);
-
- if (isSatisfied) {
- return handler.handleFill(page, elementName, desiredValue);
- }
- }
-
- return Promise.reject('Could not find matching handler.');
- },
-
- handleCheck: async function(page, elementName, desiredValue) {
- const handlers = this.getHandlers();
-
- for (let handler of handlers) {
- const isSatisfied = await handler.isSatisfiedBy(page[elementName], elementName);
-
- if (isSatisfied) {
- return handler.handleCheck(page, elementName, desiredValue);
- }
- }
-
- return Promise.reject('Could not find matching handler.');
- },
-
- getHandlers: function() {
- return availableHandlers.sort((handler, otherHandler) => handler.getPriority() - otherHandler.getPriority());
- },
-};
-
-export default FormHandler;
diff --git a/src/form-handlers/handlers.ts b/src/form-handlers/handlers.ts
new file mode 100644
index 00000000..d5133e49
--- /dev/null
+++ b/src/form-handlers/handlers.ts
@@ -0,0 +1,56 @@
+import * as formHandler from './handler';
+import { FormHandler } from './form-handler.interface';
+import Base from '../pages/base';
+
+class FormHandlers {
+ constructor(
+ private availableHandlers: FormHandler[] = [
+ formHandler.checkboxHandler,
+ formHandler.ckEditorHandler,
+ formHandler.customAngularSelectHandler,
+ formHandler.defaultHandler,
+ formHandler.fileHandler,
+ formHandler.radioHandler,
+ formHandler.selectHandler,
+ formHandler.uploadedFileHandler,
+ ]
+ ) {}
+
+ public addHandler(handler: FormHandler): void {
+ this.availableHandlers.push(handler);
+ }
+
+ public async handleFill(page: Base, elementName: string, desiredValue: string): Promise {
+ const handlers = this.getHandlers();
+
+ for (const handler of handlers) {
+ const isSatisfied = await handler.isSatisfiedBy(page.getElement(elementName), elementName);
+
+ if (isSatisfied) {
+ return handler.handleFill(page, elementName, desiredValue);
+ }
+ }
+
+ return Promise.reject('Could not find matching handler.');
+ }
+
+ public async handleCheck(page: Base, elementName: string, desiredValue: string): Promise {
+ const handlers = this.getHandlers();
+
+ for (const handler of handlers) {
+ const isSatisfied = await handler.isSatisfiedBy(page.getElement(elementName), elementName);
+
+ if (isSatisfied) {
+ return handler.handleCheck(page, elementName, desiredValue);
+ }
+ }
+
+ return Promise.reject('Could not find matching handler.');
+ }
+
+ public getHandlers(): FormHandler[] {
+ return this.availableHandlers.sort((handler, otherHandler) => handler.getPriority() - otherHandler.getPriority());
+ }
+}
+
+export default new FormHandlers();
diff --git a/src/form-handlers/index.js b/src/form-handlers/index.ts
similarity index 100%
rename from src/form-handlers/index.js
rename to src/form-handlers/index.ts
diff --git a/src/generators/generator.interface.ts b/src/generators/generator.interface.ts
new file mode 100644
index 00000000..1c71cac7
--- /dev/null
+++ b/src/generators/generator.interface.ts
@@ -0,0 +1,4 @@
+export interface Generator {
+ isSatisfiedBy(name: string): boolean;
+ generate(...params: any): Promise;
+}
diff --git a/src/generators/generator/index.js b/src/generators/generator/index.ts
similarity index 100%
rename from src/generators/generator/index.js
rename to src/generators/generator/index.ts
diff --git a/src/generators/generator/personalData.generator.spec.js b/src/generators/generator/personalData.generator.spec.ts
similarity index 100%
rename from src/generators/generator/personalData.generator.spec.js
rename to src/generators/generator/personalData.generator.spec.ts
diff --git a/src/generators/generator/personalData.generator.js b/src/generators/generator/personalData.generator.ts
similarity index 74%
rename from src/generators/generator/personalData.generator.js
rename to src/generators/generator/personalData.generator.ts
index ec198850..787b8e6b 100644
--- a/src/generators/generator/personalData.generator.js
+++ b/src/generators/generator/personalData.generator.ts
@@ -1,11 +1,12 @@
-import faker from 'faker';
+import * as faker from 'faker';
+import { Generator } from '../generator.interface';
-export const personalDataGenerator = {
- isSatisfiedBy: function(name) {
+export const personalDataGenerator: Generator = {
+ isSatisfiedBy(name) {
return name === 'personalData';
},
- generate: function(options) {
+ generate(options) {
switch (options[0]) {
case 'firstName':
return Promise.resolve(faker.name.firstName());
diff --git a/src/generators/generator/string-with-length.generator.js b/src/generators/generator/string-with-length.generator.js
deleted file mode 100644
index 3a44e895..00000000
--- a/src/generators/generator/string-with-length.generator.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const stringWithLengthGenerator = {
- isSatisfiedBy: function(name) {
- return name === 'stringWithLength';
- },
-
- generate: function(generatorParam) {
- const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
- const length = parseInt(generatorParam);
-
- let result = '';
- for (let i = length; i > 0; i--) result += chars[Math.floor(Math.random() * chars.length)];
-
- return Promise.resolve(result);
- },
-};
diff --git a/src/generators/generator/string-with-length.generator.spec.js b/src/generators/generator/string-with-length.generator.spec.ts
similarity index 100%
rename from src/generators/generator/string-with-length.generator.spec.js
rename to src/generators/generator/string-with-length.generator.spec.ts
diff --git a/src/generators/generator/string-with-length.generator.ts b/src/generators/generator/string-with-length.generator.ts
new file mode 100644
index 00000000..8cb83d99
--- /dev/null
+++ b/src/generators/generator/string-with-length.generator.ts
@@ -0,0 +1,19 @@
+import { Generator } from '../generator.interface';
+
+export const stringWithLengthGenerator: Generator = {
+ isSatisfiedBy(name) {
+ return name === 'stringWithLength';
+ },
+
+ generate(generatorParam) {
+ const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+ const length = parseInt(generatorParam);
+
+ let result = '';
+ for (let i = length; i > 0; i--) {
+ result += chars[Math.floor(Math.random() * chars.length)];
+ }
+
+ return Promise.resolve(result);
+ },
+};
diff --git a/src/generators/generators.js b/src/generators/generators.js
deleted file mode 100644
index 828b2061..00000000
--- a/src/generators/generators.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as generators from './generator';
-
-class Generators {
- constructor() {
- this.availableGenerators = [generators.personalDataGenerator, generators.stringWithLengthGenerator];
- }
-
- generate(generatorName, ...params) {
- const gen = this.findGenerator(generatorName);
-
- if (gen === undefined) {
- throw new Error(`Could not find generator for ${generatorName}.`);
- }
-
- return gen.generate(...params);
- }
-
- addGenerator(generator) {
- this.availableGenerators.push(generator);
- }
-
- findGenerator(name) {
- return this.availableGenerators.find(gen => gen.isSatisfiedBy(name));
- }
-}
-
-export const create = () => new Generators();
diff --git a/src/generators/generators.spec.js b/src/generators/generators.spec.ts
similarity index 100%
rename from src/generators/generators.spec.js
rename to src/generators/generators.spec.ts
diff --git a/src/generators/generators.ts b/src/generators/generators.ts
new file mode 100644
index 00000000..b747fc31
--- /dev/null
+++ b/src/generators/generators.ts
@@ -0,0 +1,28 @@
+import * as generators from './generator';
+import { Generator } from './generator.interface';
+
+export class Generators {
+ constructor(
+ private availableGenerators: Generator[] = [generators.personalDataGenerator, generators.stringWithLengthGenerator]
+ ) {}
+
+ public generate(generatorName: string, ...params: any): Promise {
+ const gen: Generator = this.findGenerator(generatorName);
+
+ if (gen === undefined) {
+ throw new Error(`Could not find generator for ${generatorName}.`);
+ }
+
+ return gen.generate(...params);
+ }
+
+ public addGenerator(generator: Generator): void {
+ this.availableGenerators.push(generator);
+ }
+
+ public findGenerator(name: string): Generator {
+ return this.availableGenerators.find(gen => gen.isSatisfiedBy(name));
+ }
+}
+
+export const create = () => new Generators();
diff --git a/src/generators/index.js b/src/generators/index.ts
similarity index 63%
rename from src/generators/index.js
rename to src/generators/index.ts
index 10b7f3b5..07656ec1 100644
--- a/src/generators/index.js
+++ b/src/generators/index.ts
@@ -1,3 +1,4 @@
import { create } from './generators';
+export { Generators } from './generators';
export const generators = create();
diff --git a/src/index.js b/src/index.ts
similarity index 81%
rename from src/index.js
rename to src/index.ts
index 7d92d183..a7443acb 100644
--- a/src/index.js
+++ b/src/index.ts
@@ -1,9 +1,9 @@
// entry file
-import * as pages from './pages';
import * as dictionaries from './dictionaries';
+import * as pages from './pages';
export { matchers, regexBuilder } from './matchers';
-export { defineSupportCode } from 'cucumber';
+export { defineSupportCode, Given, When, Then, After, Before, AfterAll, BeforeAll } from 'cucumber';
export { dictionaries } from './dictionaries';
export { transformers } from './transformers';
export { generators } from './generators';
@@ -12,6 +12,7 @@ export { default as handlers } from './form-handlers/handlers';
export { comparators } from './comparators';
export { emailService } from './emails';
export { waitForVisibilityOf, waitForInvisibilityOf, waitForCondition } from './web/cucumber/wait-for-condition.helper';
+export { hookHandlers } from './web/cucumber/hooks/hooks';
export const BasePage = pages.Form;
export const BaseDictionary = dictionaries.Base;
diff --git a/src/kakunin.d.ts b/src/kakunin.d.ts
new file mode 100644
index 00000000..0c8adeac
--- /dev/null
+++ b/src/kakunin.d.ts
@@ -0,0 +1,18 @@
+declare let browser: any;
+declare let by: any;
+declare let protractor: any;
+
+declare module NodeJS {
+ interface Global {
+ by: any;
+ expect(value: any): any;
+ }
+}
+
+interface Console {
+ err: any;
+}
+
+declare interface RegExpConstructor {
+ escape(text: string): any;
+}
diff --git a/src/matchers/index.js b/src/matchers/index.ts
similarity index 100%
rename from src/matchers/index.js
rename to src/matchers/index.ts
index cfe7c606..398694f7 100644
--- a/src/matchers/index.js
+++ b/src/matchers/index.ts
@@ -1,5 +1,5 @@
-import { create as createMatchers } from './matchers';
import { regexBuilder as builder } from './matcher/regex-matcher/regex-builder';
+import { create as createMatchers } from './matchers';
export const matchers = createMatchers();
export const regexBuilder = builder;
diff --git a/src/matchers/matcher.interface.ts b/src/matchers/matcher.interface.ts
new file mode 100644
index 00000000..d3f423b6
--- /dev/null
+++ b/src/matchers/matcher.interface.ts
@@ -0,0 +1,4 @@
+export interface Matcher {
+ isSatisfiedBy(prefix: string, name?: string): boolean;
+ match(element: object, param1?: string, param2?: string): Promise;
+}
diff --git a/src/matchers/matcher/attribute.matcher.spec.js b/src/matchers/matcher/attribute.matcher.spec.ts
similarity index 69%
rename from src/matchers/matcher/attribute.matcher.spec.js
rename to src/matchers/matcher/attribute.matcher.spec.ts
index f9d9b762..911d7063 100644
--- a/src/matchers/matcher/attribute.matcher.spec.js
+++ b/src/matchers/matcher/attribute.matcher.spec.ts
@@ -1,17 +1,18 @@
import { attributeMatcher } from './attribute.matcher';
-import { regexBuilder } from './regex-matcher/regex-builder';
describe('Attribute matcher', () => {
it('is satisfied when the prefix and name are correct', () => {
- expect(attributeMatcher.isSatisfiedBy('attribute', 'class:some-url-regex')).toEqual(true);
+ expect(attributeMatcher.isSatisfiedBy('attribute')).toEqual(true);
});
it('is not satisfied when the prefix and name are incorrect', () => {
- const incorrectParameters = [{ prefix: 'f' }, { prefix: 'incorrect' }, { prefix: 'g' }];
+ const incorrectParameters = [
+ { prefix: 'f', name: 'incorrect' },
+ { prefix: 'incorrect', name: 'incorrect' },
+ { prefix: 'g', name: 'isVisible' },
+ ];
- incorrectParameters.forEach(parameters =>
- expect(attributeMatcher.isSatisfiedBy(parameters.prefix, parameters.name)).toEqual(false)
- );
+ incorrectParameters.forEach(parameters => expect(attributeMatcher.isSatisfiedBy(parameters.prefix)).toEqual(false));
});
it('returns true when the attribute is matched', done => {
diff --git a/src/matchers/matcher/attribute.matcher.js b/src/matchers/matcher/attribute.matcher.ts
similarity index 59%
rename from src/matchers/matcher/attribute.matcher.js
rename to src/matchers/matcher/attribute.matcher.ts
index 6a672b54..4f5e99e6 100644
--- a/src/matchers/matcher/attribute.matcher.js
+++ b/src/matchers/matcher/attribute.matcher.ts
@@ -1,22 +1,22 @@
import { regexBuilder } from './regex-matcher/regex-builder';
+import { Matcher } from '../matcher.interface';
-class AttributeMatcher {
- isSatisfiedBy(prefix) {
+class AttributeMatcher implements Matcher {
+ public isSatisfiedBy(prefix) {
return prefix === 'attribute';
}
- match(element, attributeName, regexName) {
+ public match(element, attributeName, regexName) {
return element.getAttribute(attributeName).then(value => {
if (regexBuilder.buildRegex(`r:${regexName}`).test(value)) {
return true;
}
- /* eslint-disable max-len */
+ const transformedRegexName = `r:${regexName}`;
return Promise.reject(`
Matcher "AttributeMatcher" could not match regex on element "${element.locator()}" on attribute "${attributeName}".
- Expected to match: "${regexBuilder.buildRegex(`r:${regexName}`).toString()}", Given: "${value}"
+ Expected to match: "${regexBuilder.buildRegex(transformedRegexName).toString()}", Given: "${value}"
`);
- /* eslint-enable max-len */
});
}
}
diff --git a/src/matchers/matcher/clickable.matcher.spec.js b/src/matchers/matcher/clickable.matcher.spec.ts
similarity index 100%
rename from src/matchers/matcher/clickable.matcher.spec.js
rename to src/matchers/matcher/clickable.matcher.spec.ts
diff --git a/src/matchers/matcher/clickable.matcher.js b/src/matchers/matcher/clickable.matcher.ts
similarity index 63%
rename from src/matchers/matcher/clickable.matcher.js
rename to src/matchers/matcher/clickable.matcher.ts
index 964f5a71..1affab2e 100644
--- a/src/matchers/matcher/clickable.matcher.js
+++ b/src/matchers/matcher/clickable.matcher.ts
@@ -1,14 +1,14 @@
-class ClickableMatcher {
- isSatisfiedBy(prefix, name) {
+import { Matcher } from '../matcher.interface';
+
+class ClickableMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'isClickable';
}
- match(element) {
+ public match(element) {
return element
.getAttribute('disabled')
- .then(function(disabled) {
- return ['disabled', true, 'true'].indexOf(disabled) === -1;
- })
+ .then(disabled => ['disabled', true, 'true'].indexOf(disabled) === -1)
.then(result => {
if (result) {
return true;
diff --git a/src/matchers/matcher/currentDate.matcher.spec.js b/src/matchers/matcher/currentDate.matcher.spec.ts
similarity index 98%
rename from src/matchers/matcher/currentDate.matcher.spec.js
rename to src/matchers/matcher/currentDate.matcher.spec.ts
index b22b36ce..1bf78546 100644
--- a/src/matchers/matcher/currentDate.matcher.spec.js
+++ b/src/matchers/matcher/currentDate.matcher.spec.ts
@@ -1,5 +1,5 @@
import { currentDateMatcher } from './currentDate.matcher';
-import moment from 'moment';
+import * as moment from 'moment';
describe('Current Date matcher', () => {
it('is satisfied when the prefix and the name are correct', () => {
diff --git a/src/matchers/matcher/currentDate.matcher.js b/src/matchers/matcher/currentDate.matcher.ts
similarity index 68%
rename from src/matchers/matcher/currentDate.matcher.js
rename to src/matchers/matcher/currentDate.matcher.ts
index cd40abf6..6286b95c 100644
--- a/src/matchers/matcher/currentDate.matcher.js
+++ b/src/matchers/matcher/currentDate.matcher.ts
@@ -1,12 +1,12 @@
-import moment from 'moment';
+import * as moment from 'moment';
+import { Matcher } from '../matcher.interface';
-class CurrentDateMatcher {
- isSatisfiedBy(prefix, name) {
+class CurrentDateMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'currentDate';
}
- // eslint-disable-next-line no-unused-vars
- match(element, name = null, params = 'DD-MM-YYYY') {
+ public match(element, name = null, params = 'DD-MM-YYYY') {
const currentDate = moment(new Date()).format(params);
return element.getText().then(text => {
const compareDate = moment(new Date(text)).format(params);
@@ -15,11 +15,9 @@ class CurrentDateMatcher {
return true;
}
- /* eslint-disable max-len */
return Promise.reject(`
Matcher "CurrentDate" could not match date for element "${element.locator()}". Expected: "${compareDate}", given: "${currentDate}".
`);
- /* eslint-enable max-len */
});
}
}
diff --git a/src/matchers/matcher/index.js b/src/matchers/matcher/index.ts
similarity index 100%
rename from src/matchers/matcher/index.js
rename to src/matchers/matcher/index.ts
diff --git a/src/matchers/matcher/invisible.matcher.spec.js b/src/matchers/matcher/invisible.matcher.spec.ts
similarity index 100%
rename from src/matchers/matcher/invisible.matcher.spec.js
rename to src/matchers/matcher/invisible.matcher.spec.ts
diff --git a/src/matchers/matcher/invisible.matcher.js b/src/matchers/matcher/invisible.matcher.ts
similarity index 68%
rename from src/matchers/matcher/invisible.matcher.js
rename to src/matchers/matcher/invisible.matcher.ts
index fc5e541b..531fdbe1 100644
--- a/src/matchers/matcher/invisible.matcher.js
+++ b/src/matchers/matcher/invisible.matcher.ts
@@ -1,9 +1,11 @@
-class InvisibleMatcher {
- isSatisfiedBy(prefix, name) {
+import { Matcher } from '../matcher.interface';
+
+class InvisibleMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'isNotVisible';
}
- async match(element) {
+ public async match(element) {
try {
await element.isDisplayed();
return Promise.reject(`
diff --git a/src/matchers/matcher/not-clickable.matcher.spec.js b/src/matchers/matcher/not-clickable.matcher.spec.ts
similarity index 100%
rename from src/matchers/matcher/not-clickable.matcher.spec.js
rename to src/matchers/matcher/not-clickable.matcher.spec.ts
diff --git a/src/matchers/matcher/not-clickable.matcher.js b/src/matchers/matcher/not-clickable.matcher.ts
similarity index 63%
rename from src/matchers/matcher/not-clickable.matcher.js
rename to src/matchers/matcher/not-clickable.matcher.ts
index 2fb1c238..9ae771f0 100644
--- a/src/matchers/matcher/not-clickable.matcher.js
+++ b/src/matchers/matcher/not-clickable.matcher.ts
@@ -1,14 +1,14 @@
-class NotClickableMatcher {
- isSatisfiedBy(prefix, name) {
+import { Matcher } from '../matcher.interface';
+
+class NotClickableMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'isNotClickable';
}
- match(element) {
+ public match(element) {
return element
.getAttribute('disabled')
- .then(function(disabled) {
- return ['disabled', true, 'true'].indexOf(disabled) !== -1;
- })
+ .then(disabled => ['disabled', true, 'true'].indexOf(disabled) !== -1)
.then(result => {
if (result) {
return true;
diff --git a/src/matchers/matcher/present.matcher.spec.js b/src/matchers/matcher/present.matcher.spec.ts
similarity index 100%
rename from src/matchers/matcher/present.matcher.spec.js
rename to src/matchers/matcher/present.matcher.spec.ts
diff --git a/src/matchers/matcher/present.matcher.js b/src/matchers/matcher/present.matcher.ts
similarity index 64%
rename from src/matchers/matcher/present.matcher.js
rename to src/matchers/matcher/present.matcher.ts
index 0e38a95d..08cb556f 100644
--- a/src/matchers/matcher/present.matcher.js
+++ b/src/matchers/matcher/present.matcher.ts
@@ -1,9 +1,11 @@
-class PresentMatcher {
- isSatisfiedBy(prefix, name) {
+import { Matcher } from '../matcher.interface';
+
+class PresentMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'isPresent';
}
- match(element) {
+ public match(element) {
return element
.isPresent()
.then(() => true)
diff --git a/src/matchers/matcher/regex-matcher/index.spec.js b/src/matchers/matcher/regex-matcher/index.spec.ts
similarity index 98%
rename from src/matchers/matcher/regex-matcher/index.spec.js
rename to src/matchers/matcher/regex-matcher/index.spec.ts
index 0c2d01e2..a1f26288 100644
--- a/src/matchers/matcher/regex-matcher/index.spec.js
+++ b/src/matchers/matcher/regex-matcher/index.spec.ts
@@ -1,4 +1,4 @@
-import { regexMatcher } from './index';
+import { regexMatcher } from '.';
describe('Regex matcher', () => {
it('is satisfied when the prefix is correct and regex exists', () => {
diff --git a/src/matchers/matcher/regex-matcher/index.js b/src/matchers/matcher/regex-matcher/index.ts
similarity index 89%
rename from src/matchers/matcher/regex-matcher/index.js
rename to src/matchers/matcher/regex-matcher/index.ts
index 764fb745..77e2b6f6 100644
--- a/src/matchers/matcher/regex-matcher/index.js
+++ b/src/matchers/matcher/regex-matcher/index.ts
@@ -1,12 +1,13 @@
-import { regexBuilder } from './regex-builder';
import regex from './regex';
+import { regexBuilder } from './regex-builder';
+import { Matcher } from '../../matcher.interface';
-class RegexMatcher {
- isSatisfiedBy(prefix, name) {
+class RegexMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'r' && typeof regex[name] !== 'undefined';
}
- match(element, regexName) {
+ public match(element, regexName) {
return element.getText().then(text => {
return element.getAttribute('value').then(value => {
const regularExpression = regexBuilder.buildRegex(`r:${regexName}`);
diff --git a/src/matchers/matcher/regex-matcher/regex-builder.js b/src/matchers/matcher/regex-matcher/regex-builder.js
deleted file mode 100644
index 0d9addb2..00000000
--- a/src/matchers/matcher/regex-matcher/regex-builder.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import regex from './regex';
-
-class RegexBuilder {
- buildRegex(regexTemplate) {
- for (let property in regex) {
- if (regex.hasOwnProperty(property)) {
- if (regexTemplate === 'r:' + property) {
- return new RegExp(regex[property]);
- }
- }
- }
-
- throw 'Regex with template ' + regexTemplate + ' was not found';
- }
-}
-
-export const regexBuilder = new RegexBuilder();
diff --git a/src/matchers/matcher/regex-matcher/regex-builder.spec.js b/src/matchers/matcher/regex-matcher/regex-builder.spec.ts
similarity index 100%
rename from src/matchers/matcher/regex-matcher/regex-builder.spec.js
rename to src/matchers/matcher/regex-matcher/regex-builder.spec.ts
diff --git a/src/matchers/matcher/regex-matcher/regex-builder.ts b/src/matchers/matcher/regex-matcher/regex-builder.ts
new file mode 100644
index 00000000..5f33eba9
--- /dev/null
+++ b/src/matchers/matcher/regex-matcher/regex-builder.ts
@@ -0,0 +1,15 @@
+import regex from './regex';
+
+class RegexBuilder {
+ public buildRegex(regexTemplate: string): RegExp {
+ for (const property in regex) {
+ if (regex.hasOwnProperty(property) && regexTemplate === 'r:' + property) {
+ return new RegExp(regex[property]);
+ }
+ }
+
+ throw new Error('Regex with template ' + regexTemplate + ' was not found');
+ }
+}
+
+export const regexBuilder = new RegexBuilder();
diff --git a/src/matchers/matcher/regex-matcher/regex.js b/src/matchers/matcher/regex-matcher/regex.ts
similarity index 100%
rename from src/matchers/matcher/regex-matcher/regex.js
rename to src/matchers/matcher/regex-matcher/regex.ts
diff --git a/src/matchers/matcher/regex-matcher/regexes/default.js b/src/matchers/matcher/regex-matcher/regexes/default.ts
similarity index 90%
rename from src/matchers/matcher/regex-matcher/regexes/default.js
rename to src/matchers/matcher/regex-matcher/regexes/default.ts
index 08ba0130..5fd2abc2 100644
--- a/src/matchers/matcher/regex-matcher/regexes/default.js
+++ b/src/matchers/matcher/regex-matcher/regexes/default.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-len */
export const regex = {
arabianCharacters: '\u0621-\u064A',
arabianNumbers: '\u0660-\u0669',
@@ -13,4 +12,3 @@ export const regex = {
// todo: following regex should be moved to tests/regexes
someRandomLinkRegex: '(http(s)?://some-random-link.com)',
};
-/* eslint-enable max-len */
diff --git a/src/matchers/matcher/text.matcher.spec.js b/src/matchers/matcher/text.matcher.spec.ts
similarity index 100%
rename from src/matchers/matcher/text.matcher.spec.js
rename to src/matchers/matcher/text.matcher.spec.ts
diff --git a/src/matchers/matcher/text.matcher.js b/src/matchers/matcher/text.matcher.ts
similarity index 86%
rename from src/matchers/matcher/text.matcher.js
rename to src/matchers/matcher/text.matcher.ts
index c945b418..42fb8b4d 100644
--- a/src/matchers/matcher/text.matcher.js
+++ b/src/matchers/matcher/text.matcher.ts
@@ -1,11 +1,12 @@
import { separator } from '../matchers';
+import { Matcher } from '../matcher.interface';
-class TextMatcher {
- isSatisfiedBy(prefix) {
+class TextMatcher implements Matcher {
+ public isSatisfiedBy(prefix) {
return prefix === 't';
}
- match(element, ...params) {
+ public match(element, ...params) {
const expectedValue = params.join(separator);
return element.getTagName().then(tag => {
diff --git a/src/matchers/matcher/visible.matcher.spec.js b/src/matchers/matcher/visible.matcher.spec.ts
similarity index 91%
rename from src/matchers/matcher/visible.matcher.spec.js
rename to src/matchers/matcher/visible.matcher.spec.ts
index 6c49f146..2f2bbfcb 100644
--- a/src/matchers/matcher/visible.matcher.spec.js
+++ b/src/matchers/matcher/visible.matcher.spec.ts
@@ -9,7 +9,7 @@ describe('Visible matcher', () => {
const incorrectParameters = [{ prefix: 'f', name: 'isNotVisible' }, { prefix: 'r', name: 'isVisible' }];
incorrectParameters.forEach(parameter =>
- expect(visibleMatcher.isSatisfiedBy((parameter.prefix, parameter.name))).toEqual(false)
+ expect(visibleMatcher.isSatisfiedBy(parameter.prefix, parameter.name)).toEqual(false)
);
});
diff --git a/src/matchers/matcher/visible.matcher.js b/src/matchers/matcher/visible.matcher.ts
similarity index 66%
rename from src/matchers/matcher/visible.matcher.js
rename to src/matchers/matcher/visible.matcher.ts
index b25fe23f..2dfdd22b 100644
--- a/src/matchers/matcher/visible.matcher.js
+++ b/src/matchers/matcher/visible.matcher.ts
@@ -1,9 +1,11 @@
-class VisibleMatcher {
- isSatisfiedBy(prefix, name) {
+import { Matcher } from '../matcher.interface';
+
+class VisibleMatcher implements Matcher {
+ public isSatisfiedBy(prefix, name) {
return prefix === 'f' && name === 'isVisible';
}
- match(element) {
+ public match(element) {
return element
.isDisplayed()
.then(() => true)
diff --git a/src/matchers/matchers.spec.js b/src/matchers/matchers.spec.ts
similarity index 100%
rename from src/matchers/matchers.spec.js
rename to src/matchers/matchers.spec.ts
diff --git a/src/matchers/matchers.js b/src/matchers/matchers.ts
similarity index 70%
rename from src/matchers/matchers.js
rename to src/matchers/matchers.ts
index 8a191cae..c937a31b 100644
--- a/src/matchers/matchers.js
+++ b/src/matchers/matchers.ts
@@ -1,10 +1,11 @@
import * as matchers from './matcher';
+import { Matcher } from './matcher.interface';
export const separator = ':';
class Matchers {
- constructor() {
- this.availableMatchers = [
+ constructor(
+ private availableMatchers: Matcher[] = [
matchers.regexMatcher,
matchers.clickableMatcher,
matchers.invisibleMatcher,
@@ -14,16 +15,16 @@ class Matchers {
matchers.visibleMatcher,
matchers.attributeMatcher,
matchers.currentDateMatcher,
- ];
- }
+ ]
+ ) {}
- addMatcher(matcher) {
+ public addMatcher(matcher: Matcher): void {
this.availableMatchers.push(matcher);
}
- match(element, matcherName) {
+ public match(element: object, matcherName: string): Promise {
const splittedValue = matcherName.split(separator);
- const matcher = this.findMatcher(splittedValue[0], splittedValue.slice(1));
+ const matcher = this.findMatcher(splittedValue[0], splittedValue[1]);
if (matcher === undefined) {
throw new Error(`Could not find matcher for ${matcherName}.`);
@@ -32,8 +33,8 @@ class Matchers {
return matcher.match(element, ...splittedValue.slice(1));
}
- findMatcher(prefix, params) {
- return this.availableMatchers.find(matcher => matcher.isSatisfiedBy(prefix, ...params));
+ public findMatcher(prefix: string, param: string): Matcher {
+ return this.availableMatchers.find(matcher => matcher.isSatisfiedBy(prefix, param));
}
}
diff --git a/src/pages/base.ts b/src/pages/base.ts
new file mode 100644
index 00000000..e2ec3458
--- /dev/null
+++ b/src/pages/base.ts
@@ -0,0 +1,113 @@
+import config from '../core/config.helper';
+import { waitForInvisibilityOf, waitForVisibilityOf } from '../web/cucumber/wait-for-condition.helper';
+import { isRelativePage, waitForUrlChangeTo } from '../web/url-parser.helper';
+import { stringify } from 'querystring';
+import { element } from 'protractor';
+
+class Page {
+ private url: string;
+
+ public visit() {
+ if (config.type === 'otherWeb' || !isRelativePage(this.url)) {
+ protractor.browser.ignoreSynchronization = true;
+
+ return protractor.browser.get(this.url);
+ }
+
+ return protractor.browser.get(this.url).then(() => protractor.browser.waitForAngular());
+ }
+
+ public visitWithParameters(data) {
+ const additionalParams = [];
+
+ const url =
+ data.raw().reduce((prev, item) => {
+ if (prev.indexOf(`:${item[0]}`) === -1) {
+ additionalParams.push(item);
+ return prev;
+ }
+ return prev.replace(`:${item[0]}`, item[1]);
+ }, this.url) + (additionalParams.length > 0 ? '?' + stringify(additionalParams) : '');
+
+ if (config.type === 'otherWeb' || !isRelativePage(url)) {
+ protractor.browser.ignoreSynchronization = true;
+
+ return protractor.browser.get(url);
+ }
+
+ return protractor.browser.get(url).then(() => protractor.browser.waitForAngular());
+ }
+
+ public async isOn() {
+ if (isRelativePage(this.url) && config.type !== 'otherWeb') {
+ protractor.browser.ignoreSynchronization = false;
+ }
+
+ return browser.wait(async () => {
+ const currentUrl = await browser.getCurrentUrl().then(url => url);
+
+ return waitForUrlChangeTo(this.url, currentUrl)(config.baseUrl);
+ }, config.waitForPageTimeout * 1000);
+ }
+
+ public click(elementName: string) {
+ return this.getElement(elementName).click();
+ }
+
+ public isDisabled(elementName: string) {
+ return this.getElement(elementName)
+ .getAttribute('disabled')
+ .then(disabled => ['disabled', true, 'true'].indexOf(disabled) !== -1);
+ }
+
+ public isVisible(elementName: string) {
+ return this.getElement(elementName).isDisplayed();
+ }
+
+ public isPresent(elementName: string) {
+ return this.getElement(elementName).isPresent();
+ }
+
+ public getNumberOfElements(elementName: string) {
+ return this.getElements(elementName).count();
+ }
+
+ public scrollIntoElement(elementName: string, elementIndex?: string) {
+ if (elementIndex !== undefined) {
+ return browser.executeScript(
+ 'arguments[0].scrollIntoView(false);',
+ this.getElement(elementName)
+ .get(elementIndex)
+ .getWebElement()
+ );
+ }
+
+ return browser.executeScript('arguments[0].scrollIntoView(false);', this.getElement(elementName).getWebElement());
+ }
+
+ public waitForVisibilityOf(elementName: string) {
+ return waitForVisibilityOf(this.getElement(elementName));
+ }
+
+ public waitForInvisibilityOf(elementName: string) {
+ return waitForInvisibilityOf(this.getElement(elementName));
+ }
+
+ public getElement(elementName: string) {
+ if (!this[elementName]) {
+ return element(by.css(elementName));
+ }
+
+ return this[elementName];
+ }
+
+ public getElements(elementName: string) {
+ if (!this[elementName]) {
+ return element.all(by.css(elementName));
+ }
+
+ return this[elementName];
+ }
+}
+
+export default Page;
diff --git a/src/pages/form.js b/src/pages/form.ts
similarity index 71%
rename from src/pages/form.js
rename to src/pages/form.ts
index b423190a..40d1b396 100644
--- a/src/pages/form.js
+++ b/src/pages/form.ts
@@ -1,29 +1,29 @@
-import Base from './base';
import { fromHandlers } from '../form-handlers';
import { transformers } from '../transformers';
+import Base from './base';
class FormPage extends Base {
- async fillForm(formData) {
- for (let item of formData) {
+ public async fillForm(formData) {
+ for (const item of formData) {
await this.fillField(item[0], item[1]);
}
return Promise.resolve();
}
- async checkForm(formData) {
- for (let item of formData) {
+ public async checkForm(formData) {
+ for (const item of formData) {
await this.checkField(item[0], item[1]);
}
return Promise.resolve();
}
- fillField(name, value) {
+ public fillField(name, value) {
return fromHandlers.handleFill(this, name, transformers.transform(value));
}
- checkField(name, value) {
+ public checkField(name, value) {
return fromHandlers.handleCheck(this, name, transformers.transform(value));
}
}
diff --git a/src/pages/index.js b/src/pages/index.ts
similarity index 100%
rename from src/pages/index.js
rename to src/pages/index.ts
diff --git a/src/protractor.conf.js b/src/protractor.conf.ts
similarity index 64%
rename from src/protractor.conf.js
rename to src/protractor.conf.ts
index 3c21214f..79a31412 100644
--- a/src/protractor.conf.js
+++ b/src/protractor.conf.ts
@@ -1,15 +1,15 @@
require('./core/prototypes');
-const path = require('path');
-const chai = require('chai');
-const config = require('./core/config.helper').default;
-const modulesLoader = require('./core/modules-loader.helper.js').create();
-const { deleteReports } = require('./core/fs/delete-files.helper');
-const { prepareCatalogs } = require('./core/fs/prepare-catalogs.helper');
-const browsersConfiguration = require('./web/browsers/browsers-config.helper');
-const chaiAsPromised = require('chai-as-promised');
-const { emailService } = require('./emails');
+import * as jestExpect from 'expect';
+import * as path from 'path';
+import config from './core/config.helper';
+import { deleteReports } from './core/fs/delete-files.helper';
+import { prepareCatalogs } from './core/fs/prepare-catalogs.helper';
+import { browsersConfiguration, setSeleniumAddress } from './web/browsers/browsers-config.helper';
+import { getBrowsersDrivers } from './web/browsers/get-browser-drivers.helper';
+import { connectBrowserstack, disconnectBrowserstack } from './web/browsers/browserstack-config.helper';
+import { emailService } from './emails';
const commandArgs = require('minimist')(process.argv.slice(2));
-chai.use(chaiAsPromised);
+const modulesLoader = require('./core/modules-loader.helper.js').create();
const reportsDirectory = path.join(config.projectPath, config.reports);
const jsonOutputDirectory = path.join(reportsDirectory, 'json-output-folder');
@@ -17,12 +17,12 @@ const generatedReportsDirectory = path.join(reportsDirectory, 'report');
const featureReportsDirectory = path.join(generatedReportsDirectory, 'features');
const performanceReportsDirectory = path.join(reportsDirectory, 'performance');
-const prepareReportCatalogs = async () => {
- await prepareCatalogs(reportsDirectory);
- await prepareCatalogs(jsonOutputDirectory);
- await prepareCatalogs(generatedReportsDirectory);
- await prepareCatalogs(featureReportsDirectory);
- await prepareCatalogs(performanceReportsDirectory);
+const prepareReportCatalogs = () => {
+ prepareCatalogs(reportsDirectory);
+ prepareCatalogs(jsonOutputDirectory);
+ prepareCatalogs(generatedReportsDirectory);
+ prepareCatalogs(featureReportsDirectory);
+ prepareCatalogs(performanceReportsDirectory);
};
const deleteReportFiles = () => {
@@ -35,8 +35,12 @@ const deleteReportFiles = () => {
console.log('All reports have been deleted!');
};
+const configureMultiCapabilities = () => browsersConfiguration(config, commandArgs);
+
exports.config = {
- getMultiCapabilities: browsersConfiguration(config, commandArgs),
+ seleniumAddress: setSeleniumAddress(commandArgs, config),
+ getMultiCapabilities: configureMultiCapabilities(),
+ jvmArgs: getBrowsersDrivers(commandArgs),
useAllAngular2AppRoots: config.type === 'ng2',
@@ -50,10 +54,9 @@ exports.config = {
cucumberOpts: {
require: [
'./web/cucumber/config.js',
- './web/cucumber/hooks.js',
'./step_definitions/**/*.js',
+ './web/cucumber/hooks.js',
...config.step_definitions.map(file => path.join(config.projectPath, file, '**/*.js')),
- ...config.hooks.map(file => path.join(config.projectPath, file, '**/*.js')),
],
format: [`json:./${config.reports}/features-report.json`],
profile: false,
@@ -72,12 +75,20 @@ exports.config = {
},
],
- beforeLaunch: async function() {
- await prepareReportCatalogs();
- await deleteReportFiles();
+ async beforeLaunch() {
+ prepareReportCatalogs();
+ deleteReportFiles();
+
+ if (commandArgs.browserstack) {
+ await connectBrowserstack((await configureMultiCapabilities()())[0]['browserstack.key']);
+ }
+ },
+
+ async afterLaunch() {
+ await disconnectBrowserstack(commandArgs.browserstack);
},
- onPrepare: function() {
+ onPrepare() {
if (!config.headless) {
browser.driver
.manage()
@@ -92,6 +103,7 @@ exports.config = {
modulesLoader.getModules('form_handlers');
modulesLoader.getModules('transformers');
modulesLoader.getModules('emails');
+ modulesLoader.getModules('hooks');
const modules = modulesLoader.getModulesAsObject(config.pages.map(page => path.join(config.projectPath, page)));
@@ -100,7 +112,7 @@ exports.config = {
{}
);
- global.expect = chai.expect;
+ global.expect = jestExpect;
if (config.clearEmailInboxBeforeTests) {
return emailService.clearInbox();
diff --git a/src/rest/api-request.ts b/src/rest/api-request.ts
new file mode 100644
index 00000000..f3255e1d
--- /dev/null
+++ b/src/rest/api-request.ts
@@ -0,0 +1,45 @@
+import { Headers } from 'node-fetch';
+import FormData = require('form-data');
+
+interface HeaderList {
+ [name: string]: string;
+}
+
+export class ApiRequest {
+ public method: string;
+ public endpoint: string;
+ private payload: string | object;
+ private headers: Headers;
+ private formData: FormData;
+
+ constructor() {
+ this.payload = null;
+ this.headers = new Headers();
+ this.formData = new FormData();
+ }
+
+ public addHeaders(headers: HeaderList) {
+ for (const [key, value] of Object.entries(headers)) {
+ this.headers.append(key, value);
+ }
+ }
+
+ public addFormData(payload) {
+ for (const table of payload) {
+ this.formData.append(table[0], table[1]);
+ }
+ return this.formData;
+ }
+
+ get body() {
+ return this.payload;
+ }
+
+ set body(payload) {
+ if (payload instanceof FormData) {
+ this.payload = payload;
+ } else {
+ this.payload = payload ? JSON.stringify(payload) : undefined;
+ }
+ }
+}
diff --git a/src/rest/api-response.spec.ts b/src/rest/api-response.spec.ts
new file mode 100644
index 00000000..a5b11a70
--- /dev/null
+++ b/src/rest/api-response.spec.ts
@@ -0,0 +1,32 @@
+import { ApiResponse } from './api-response';
+
+const response = new ApiResponse(200, { type: 'Fiat', model: '500', color: 'white' });
+
+describe('apiResponse', () => {
+ it('returns true when statuses are the same', () => {
+ expect(response.hasStatus(200)).toEqual(true);
+ });
+
+ it('returns false when statuses are different', () => {
+ expect(response.hasStatus(100)).toEqual(false);
+ });
+
+ it('returns true when response match given object', () => {
+ expect(
+ response.hasBodyMatch({
+ type: 'Fiat',
+ model: '500',
+ color: 'white',
+ })
+ ).toEqual(true);
+ });
+
+ it('returns false when response doesnt match given object', () => {
+ expect(
+ response.hasBodyMatch({
+ model: '500',
+ color: 'white',
+ })
+ ).toEqual(false);
+ });
+});
diff --git a/src/rest/api-response.ts b/src/rest/api-response.ts
new file mode 100644
index 00000000..704b69ae
--- /dev/null
+++ b/src/rest/api-response.ts
@@ -0,0 +1,33 @@
+import * as _ from 'lodash';
+import * as Ajv from 'ajv';
+const ajv = new Ajv({ allErrors: true });
+
+export class ApiResponse {
+ private readonly body: object;
+ private readonly status: number;
+
+ constructor(responseStatus, body) {
+ this.body = body;
+ this.status = responseStatus;
+ }
+
+ public hasStatus(status) {
+ return this.status === status;
+ }
+
+ public hasBodyMatch(body) {
+ if (Object.keys(this.body).length === 0) {
+ return Error('Response from server was empty');
+ }
+ return _.isEqual(this.body, body);
+ }
+
+ public hasMatchingSchema(schema) {
+ const test = ajv.compile(schema);
+ const isValid = test(this.body);
+
+ if (isValid === false) {
+ throw Error('Response doesnt match schema');
+ }
+ }
+}
diff --git a/src/rest/rest-api-service.ts b/src/rest/rest-api-service.ts
new file mode 100644
index 00000000..8d112d09
--- /dev/null
+++ b/src/rest/rest-api-service.ts
@@ -0,0 +1,28 @@
+import fetch from 'node-fetch';
+import { ApiResponse } from './api-response';
+
+export class RestApiService {
+ private readonly baseUrl: string;
+
+ constructor(baseUrl) {
+ this.baseUrl = baseUrl;
+ }
+
+ public fetch(request) {
+ const url = this.resolveUrl(request.endpoint);
+
+ return fetch(url, { method: request.method, body: request.body, headers: request.headers }).then(response => {
+ const contentType = response.headers.get('content-type');
+ if (contentType && contentType.startsWith('application/json')) {
+ return response.json().then(requestBody => {
+ return new ApiResponse(response.status, requestBody);
+ });
+ }
+ return new ApiResponse(response.status, {});
+ });
+ }
+
+ private resolveUrl(endpoint) {
+ return `${this.baseUrl}${endpoint}`;
+ }
+}
diff --git a/src/step_definitions/api.ts b/src/step_definitions/api.ts
new file mode 100644
index 00000000..74e55b19
--- /dev/null
+++ b/src/step_definitions/api.ts
@@ -0,0 +1,82 @@
+import { defineSupportCode } from 'cucumber';
+import config from '../core/config.helper';
+import { RestApiService } from '../rest/rest-api-service';
+import { ApiRequest } from '../rest/api-request';
+
+const service = new RestApiService(config.apiUrl);
+let apiRequest = new ApiRequest();
+
+defineSupportCode(({ When, Then }) => {
+ let fetchResult;
+
+ When(/^I send "([^"]*)" request on "([^"]*)" endpoint$/, (method, endpoint) => {
+ apiRequest.method = method;
+ apiRequest.endpoint = endpoint;
+ return service
+ .fetch(apiRequest)
+ .then(response => {
+ fetchResult = response;
+ return response;
+ })
+ .finally(() => {
+ apiRequest = new ApiRequest();
+ return apiRequest;
+ });
+ });
+
+ When(/^I send "([^"]*)" request on "([^"]*)" endpoint with JSON body:$/, (method, endpoint, payload) => {
+ apiRequest.method = method;
+ apiRequest.endpoint = endpoint;
+ apiRequest.body = JSON.parse(payload);
+ apiRequest.addHeaders({ 'Content-Type': 'application/json' });
+
+ return service
+ .fetch(apiRequest)
+ .then(response => {
+ fetchResult = response;
+ return response;
+ })
+ .finally(() => {
+ apiRequest = new ApiRequest();
+ return apiRequest;
+ });
+ });
+
+ When(/^I send "([^"]*)" request on "([^"]*)" endpoint using form data:$/, (method, endpoint, payload) => {
+ apiRequest.method = method;
+ apiRequest.endpoint = endpoint;
+ apiRequest.body = apiRequest.addFormData(payload.raw());
+ apiRequest.addHeaders({ 'Content-Type': 'multipart/form-data' });
+
+ return service
+ .fetch(apiRequest)
+ .then(response => {
+ fetchResult = response;
+ return response;
+ })
+ .finally(() => {
+ apiRequest = new ApiRequest();
+ return apiRequest;
+ });
+ });
+
+ When(/^I set request headers:$/, headers => {
+ return apiRequest.addHeaders(headers.rowsHash());
+ });
+
+ Then(/^the response code should be "([^"]*)"$/, status => {
+ return expect(fetchResult.hasStatus(parseInt(status))).toBe(true);
+ });
+
+ Then(/^the response should exact match to body:$/, body => {
+ return expect(fetchResult.hasBodyMatch(JSON.parse(body))).toBe(true);
+ });
+
+ Then(/^the response should match JSON schema:$/, schema => {
+ try {
+ fetchResult.hasMatchingSchema(JSON.parse(schema));
+ } catch (error) {
+ return Promise.reject(error);
+ }
+ });
+});
diff --git a/src/step_definitions/debug.js b/src/step_definitions/debug.js
deleted file mode 100644
index b940988e..00000000
--- a/src/step_definitions/debug.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-
-defineSupportCode(function({ Then }) {
- Then(/^I wait for "([^"]*)" seconds$/, function(number) {
- return browser.sleep(Number(number) * 1000);
- });
-});
diff --git a/src/step_definitions/debug.ts b/src/step_definitions/debug.ts
new file mode 100644
index 00000000..27b498e4
--- /dev/null
+++ b/src/step_definitions/debug.ts
@@ -0,0 +1,5 @@
+import { Then } from 'cucumber';
+
+Then(/^I wait for "([^"]*)" seconds$/, seconds => {
+ return browser.sleep(Number(seconds) * 1000);
+});
diff --git a/src/step_definitions/elements.js b/src/step_definitions/elements.js
deleted file mode 100644
index f426cbe5..00000000
--- a/src/step_definitions/elements.js
+++ /dev/null
@@ -1,544 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import { matchers, regexBuilder } from '../matchers';
-import variableStore from '../web/variable-store.helper';
-import { comparators } from '../comparators';
-import config from '../core/config.helper';
-import chalk from 'chalk';
-import { waitForCondition } from '../web/cucumber/wait-for-condition.helper';
-
-const timeout = parseInt(config.elementsVisibilityTimeout) * 1000;
-
-const handlePromises = (hashedData, onSuccess, onReject) => resolvedPromises => {
- for (let i = 0; i < resolvedPromises.length; i += hashedData.length) {
- let allFieldsMatching = true;
-
- for (let j = i; j < i + hashedData.length; j++) {
- if (resolvedPromises[j] === false) {
- allFieldsMatching = false;
- break;
- }
- }
-
- if (allFieldsMatching) {
- return onSuccess();
- }
- }
-
- return onReject();
-};
-
-defineSupportCode(function({ When, Then }) {
- function checkNumberOfElements(numberExpression, element) {
- const self = this;
- const numberPattern = /\d+/g;
- const numbers = numberExpression.match(numberPattern).map(item => parseInt(item));
-
- const expectFunction = function(words, num) {
- return expect(self.currentPage.getNumberOfElements(element)).to.eventually.be[words.pop()](...num);
- };
-
- return expectFunction(numberExpression.substr(0, numberExpression.indexOf(numbers[0]) - 1).split(' '), numbers);
- }
-
- When(/^I wait for "([^"]*)" of the "([^"]*)" element$/, function(condition, elementName) {
- if (this.currentPage[elementName] instanceof protractor.ElementArrayFinder) {
- return waitForCondition(condition, timeout)(this.currentPage[elementName].first());
- }
-
- return waitForCondition(condition, timeout)(this.currentPage[elementName]);
- });
-
- When(/^I scroll to the "([^"]*)" element$/, function(elementName) {
- return this.currentPage.scrollIntoElement(elementName);
- });
-
- When(/^I click the "([^"]*)" element$/, function(elementName) {
- return this.currentPage
- .scrollIntoElement(elementName)
- .catch(() => Promise.resolve())
- .then(() => this.currentPage.waitForVisibilityOf(elementName))
- .then(() => this.currentPage.scrollIntoElement(elementName))
- .then(() => this.currentPage.click(elementName))
- .catch(() => {
- return waitForCondition('elementToBeClickable', timeout)(this.currentPage[elementName]).then(() => {
- return this.currentPage.click(elementName);
- });
- })
- .catch(() => {
- console.warn('Warning! Element was not clickable. We need to scroll it down.');
- return browser
- .executeScript('window.scrollBy(0,50);')
- .then(() => this.currentPage.waitForVisibilityOf(elementName))
- .then(() => this.currentPage.click(elementName));
- })
- .catch(() => {
- console.warn(
- 'Warning! Element was not clickable. We need use the WebDriver method to perform the click action.'
- );
- return browser
- .actions()
- .mouseMove(this.currentPage[elementName])
- .mouseMove({ x: 5, y: 0 })
- .click()
- .perform();
- })
- .catch(() => {
- return Promise.reject(`Error, after scrolling the element "${elementName}" is still not clickable.`);
- });
- });
-
- When(/^I store the "([^"]*)" element text as "([^"]*)" variable$/, function(elementName, variable) {
- return this.currentPage.waitForVisibilityOf(elementName).then(async () => {
- const elementTag = await this.currentPage[elementName].getTagName(tag => tag);
-
- if (elementTag === 'input' || elementTag === 'textarea') {
- return this.currentPage[elementName].getAttribute('value').then(value => {
- variableStore.storeVariable(variable, value);
- });
- }
-
- return this.currentPage[elementName].getText().then(text => {
- variableStore.storeVariable(variable, text);
- });
- });
- });
-
- When(/^I update the "([^"]*)" element text as "([^"]*)" variable$/, function(elementName, variable) {
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- this.currentPage[elementName].getText().then(text => {
- variableStore.updateVariable(variable, text);
- });
- });
- });
-
- When(/^I store the "([^"]*)" element text matched by "([^"]*)" as "([^"]*)" variable$/, function(
- elementName,
- matcher,
- variable
- ) {
- const regex = regexBuilder.buildRegex(matcher);
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return this.currentPage[elementName].getText().then(text => {
- const matchedText = text.match(regex);
-
- if (matchedText === null) {
- return Promise.reject(`Could not match text ${text} with matcher ${matcher}`);
- }
-
- if (matchedText.length <= 1) {
- return Promise.reject(`Matcher ${matcher} does not contain capturing brackets`);
- }
-
- variableStore.storeVariable(variable, matchedText[1]);
- });
- });
- });
-
- When(/^I wait for the "([^"]*)" element to disappear$/, function(element, sync) {
- const self = this;
- let maxRepeats = 10;
-
- const interval = setInterval(() => {
- console.log('Waiting for element to disappear...');
-
- return self.currentPage.isPresent(element).then(isPresent => {
- if (!isPresent) {
- clearInterval(interval);
- sync();
- return;
- }
-
- maxRepeats--;
-
- if (maxRepeats === 0) {
- clearInterval(interval);
- sync('Element is still visible');
- }
- });
- }, 1500);
- });
-
- Then(/^the "([^"]*)" element is present$/, function(elementName) {
- chalk.red(
- 'DEPRECATED: the "([^"]*)" element is present , use I wait for "([^"]*)" of the "([^"]*)" element instead.'
- );
- return expect(this.currentPage.isPresent(elementName)).to.eventually.be.true;
- });
-
- Then(/^the "([^"]*)" element is not present$/, function(elementName) {
- chalk.red(
- 'DEPRECATED: the "([^"]*)" element is not present , use I wait for the "([^"]*)" element to disappear instead.'
- );
- return expect(this.currentPage.isPresent(elementName)).to.eventually.be.false;
- });
-
- Then(/^the "([^"]*)" element is visible$/, function(elementName) {
- return this.currentPage.isVisible(elementName);
- });
-
- Then(/^the "([^"]*)" element is not visible$/, function(elementName) {
- return this.currentPage
- .isVisible(elementName)
- .then(isVisible => Promise.reject(isVisible))
- .catch(isVisible => {
- if (isVisible === true) {
- return Promise.reject(`Element '${elementName}' should not be visible.`);
- }
-
- return Promise.resolve();
- });
- });
-
- Then(/^the "([^"]*)" element is disabled$/, function(elementName) {
- return expect(this.currentPage.isDisabled(elementName)).to.eventually.be.true;
- });
-
- When(/^I store table "([^"]*)" rows as "([^"]*)" with columns:$/, function(table, variableName, data) {
- const self = this;
- const columns = data.raw().map(element => element[0]);
- const promises = [];
- return this.currentPage.waitForVisibilityOf(table).then(() => {
- return this.currentPage[table]
- .each(function(element) {
- const rowPromises = [];
-
- for (const columnIndex in columns) {
- if (columns.hasOwnProperty(columnIndex)) {
- rowPromises.push(element.element(self.currentPage[columns[columnIndex]].locator()).getText());
- }
- }
-
- promises.push(Promise.all(rowPromises));
- })
- .then(function() {
- return Promise.all(promises).then(function(resolvedPromises) {
- variableStore.storeVariable(variableName, resolvedPromises);
- });
- });
- });
- });
-
- Then(/^there are following elements in table "([^"]*)":$/, function(table, data) {
- const self = this;
- const allElements = this.currentPage[table];
- const hashes = data.hashes();
- return this.currentPage.waitForVisibilityOf(table).then(() => {
- return checkNumberOfElements.call(this, `equal ${hashes.length}`, table).then(function() {
- const promises = [];
-
- return allElements
- .each(function(element, index) {
- const hash = hashes[index];
-
- for (const prop in hash) {
- if (hash.hasOwnProperty(prop)) {
- const propValue = hash[prop];
-
- promises.push(
- matchers.match(
- element.element(self.currentPage[prop].locator()),
- variableStore.replaceTextVariables(propValue)
- )
- );
- }
- }
- })
- .then(function() {
- return Promise.all(promises);
- });
- });
- });
- });
-
- Then(/^there are "([^"]*)" following elements for element "([^"]*)":$/, function(
- numberExpression,
- elementName,
- data
- ) {
- const self = this;
- const allElements = this.currentPage[elementName];
- const hashedData = data.raw();
-
- if (hashedData.length === 0) {
- return Promise.reject('Missing table under the step.');
- }
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return checkNumberOfElements.call(this, numberExpression, elementName).then(function() {
- const promises = [];
-
- return allElements
- .each(function(element) {
- hashedData.forEach(function(hash) {
- promises.push(
- matchers.match(
- element.element(self.currentPage[hash[0]].locator()),
- variableStore.replaceTextVariables(hash[1])
- )
- );
- });
- })
- .then(function() {
- return Promise.all(promises);
- });
- });
- });
- });
-
- Then(/^there is element "([^"]*)" with value "([^"]*)"$/, function(elementName, value) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers.match(pageElement, variableStore.replaceTextVariables(value)).then(function(matcherResult) {
- return expect(matcherResult).to.be.true;
- });
- });
- });
-
- Then(/^there is no element "([^"]*)" with value "([^"]*)"$/, function(elementName, value) {
- const pageElement = this.currentPage[elementName];
-
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(value))
- .catch(() => Promise.resolve(false))
- .then(result => (result ? Promise.reject() : Promise.resolve()));
- });
-
- Then(/^there is element "([^"]*)" containing "([^"]*)" text$/, function(elementName, value) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers.match(pageElement, variableStore.replaceTextVariables(`t:${value}`));
- });
- });
-
- Then(/^there is no element "([^"]*)" containing "([^"]*)" text$/, function(elementName, value) {
- const pageElement = this.currentPage[elementName];
-
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(`t:${value}`))
- .catch(() => Promise.resolve(false))
- .then(result => (result ? Promise.reject() : Promise.resolve()));
- });
-
- Then(/^there is element "([^"]*)" matching "([^"]*)" matcher$/, function(elementName, matcher) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(`f:${matcher}`))
- .then(function(matcherResult) {
- return expect(matcherResult).to.be.true;
- });
- });
- });
-
- Then(/^there is no element "([^"]*)" matching "([^"]*)" matcher$/, function(elementName, matcher) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(`f:${matcher}`))
- .catch(() => Promise.resolve(false))
- .then(result => (result ? Promise.reject() : Promise.resolve()));
- });
- });
-
- Then(/^there is element "([^"]*)" with "([^"]*)" regex$/, function(elementName, matcher) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(`r:${matcher}`))
- .then(function(matcherResult) {
- return expect(matcherResult).to.be.true;
- });
- });
- });
-
- Then(/^there is no element "([^"]*)" with "([^"]*)" regex$/, function(elementName, matcher) {
- const pageElement = this.currentPage[elementName];
-
- return this.currentPage.waitForVisibilityOf(elementName).then(() => {
- return matchers
- .match(pageElement, variableStore.replaceTextVariables(`r:${matcher}`))
- .catch(() => Promise.resolve(false))
- .then(result => (result ? Promise.reject() : Promise.resolve()));
- });
- });
-
- Then(/^there are "([^"]*)" "([^"]*)" elements$/, checkNumberOfElements);
-
- Then(/^every "([^"]*)" element should have the same value for element "([^"]*)"$/, function(
- containerName,
- elementName
- ) {
- const self = this;
- return this.currentPage.waitForVisibilityOf(containerName).then(() => {
- return this.currentPage[containerName]
- .first()
- .element(self.currentPage[elementName].locator())
- .getText()
- .then(function(firstElementText) {
- return self.currentPage[containerName].each(function(containerElement) {
- containerElement
- .element(self.currentPage[elementName].locator())
- .getText()
- .then(function(elementText) {
- expect(elementText).to.be.equal(firstElementText);
- });
- });
- });
- });
- });
-
- Then(/^the element "([^"]*)" should have an item with values:$/, function(elementName, data) {
- const self = this;
- const allElements = this.currentPage[elementName];
- const hashedData = data.raw();
-
- if (hashedData.length === 0) {
- return Promise.reject('Missing table under the step.');
- }
-
- const promises = [];
- return this.currentPage
- .waitForVisibilityOf(elementName)
- .then(() => {
- return allElements.each(function(element) {
- hashedData.forEach(function(hash) {
- promises.push(
- matchers
- .match(
- element.element(self.currentPage[hash[0]].locator()),
- variableStore.replaceTextVariables(hash[1])
- )
- .catch(() => false)
- );
- });
- });
- })
- .then(function() {
- return Promise.all(promises).then(
- handlePromises(
- hashedData,
- () => Promise.resolve(),
- () => Promise.reject('No matching element has been found.')
- )
- );
- });
- });
-
- Then(/^the element "([^"]*)" should not have an item with values:$/, function(elementName, data) {
- const self = this;
- const allElements = this.currentPage[elementName];
- const hashedData = data.raw();
-
- if (hashedData.length === 0) {
- return Promise.reject('Missing table under the step.');
- }
-
- const promises = [];
-
- return allElements
- .each(function(element) {
- hashedData.forEach(function(hash) {
- promises.push(
- matchers
- .match(element.element(self.currentPage[hash[0]].locator()), variableStore.replaceTextVariables(hash[1]))
- .catch(() => false)
- );
- });
- })
- .then(function() {
- return Promise.all(promises).then(
- handlePromises(hashedData, () => Promise.reject('Matching element has been found'), () => Promise.resolve())
- );
- });
- });
-
- Then(/^"([^"]*)" value on the "([^"]*)" list is sorted in "([^"]*)" order$/, function(
- elementValue,
- elementList,
- dependency
- ) {
- const self = this;
- const promise = [];
-
- return this.currentPage.waitForVisibilityOf(elementList).then(() => {
- return self.currentPage[elementList]
- .each(function(singleElement) {
- promise.push(singleElement.element(self.currentPage[elementValue].locator()).getText());
- })
- .then(function() {
- return Promise.all(promise);
- })
- .then(function(elementsValues) {
- return comparators.compare(elementsValues, dependency);
- });
- });
- });
-
- When(/^I infinitely scroll to the "([^"]*)" element$/, function(elementName) {
- const self = this;
-
- const scrollToLoader = () => {
- return self.currentPage
- .isPresent(elementName)
- .then(isPresent => {
- if (isPresent) {
- return self.currentPage.scrollIntoElement(elementName);
- }
-
- return Promise.resolve();
- })
- .then(() => self.currentPage.isPresent(elementName))
- .then(isPresent => {
- if (isPresent) {
- return browser.sleep(1000).then(() => scrollToLoader());
- }
-
- return Promise.resolve();
- });
- };
-
- return scrollToLoader();
- });
-
- When(/^I press the "([^"]*)" key$/, function(key) {
- const keyTransformed = key.toUpperCase();
-
- return Promise.resolve(
- browser
- .actions()
- .sendKeys(protractor.Key[keyTransformed])
- .perform()
- );
- });
-
- When(/^I drag "([^"]*)" element and drop over "([^"]*)" element$/, async function(elementDrag, elementDrop) {
- const wait = timeToWait => browser.sleep(timeToWait);
-
- await this.currentPage.waitForVisibilityOf(elementDrag);
- await browser
- .actions()
- .mouseMove(this.currentPage[elementDrag])
- .perform();
- await wait(200);
- await browser
- .actions()
- .mouseDown()
- .perform();
- await wait(200);
- await browser
- .actions()
- .mouseMove(this.currentPage[elementDrop])
- .perform();
- await wait(200);
- await browser
- .actions()
- .mouseUp()
- .perform();
- });
-});
diff --git a/src/step_definitions/elements.ts b/src/step_definitions/elements.ts
new file mode 100644
index 00000000..d70d56a1
--- /dev/null
+++ b/src/step_definitions/elements.ts
@@ -0,0 +1,547 @@
+import * as chai from 'chai';
+import { When, Then } from 'cucumber';
+import { comparators } from '../comparators';
+import config from '../core/config.helper';
+import { matchers, regexBuilder } from '../matchers';
+import { waitForCondition } from '../web/cucumber/wait-for-condition.helper';
+import variableStore from '../web/variable-store.helper';
+
+const timeout = parseInt(config.elementsVisibilityTimeout) * 1000;
+
+const handlePromises = (hashedData, onSuccess, onReject) => resolvedPromises => {
+ for (let i = 0; i < resolvedPromises.length; i += hashedData.length) {
+ let allFieldsMatching = true;
+
+ for (let j = i; j < i + hashedData.length; j++) {
+ if (resolvedPromises[j] === false) {
+ allFieldsMatching = false;
+ break;
+ }
+ }
+
+ if (allFieldsMatching) {
+ return onSuccess();
+ }
+ }
+
+ return onReject();
+};
+
+function checkNumberOfElements(numberExpression, element) {
+ const self = this;
+ const numberPattern = /\d+/g;
+ const numbers = numberExpression.match(numberPattern).map(item => parseInt(item));
+
+ const expectFunction = async (words, num) => {
+ const numberOfElements = await self.currentPage.getNumberOfElements(element);
+ return chai.expect(numberOfElements).to.be[words.pop()](...num);
+ };
+
+ return expectFunction(numberExpression.substr(0, numberExpression.indexOf(numbers[0]) - 1).split(' '), numbers);
+}
+
+When(/^I wait for "([^"]*)" of the "([^"]*)" element$/, function(condition, elementName) {
+ if (this.currentPage.getElement(elementName) instanceof protractor.ElementArrayFinder) {
+ return waitForCondition(condition, timeout)(this.currentPage.getElement(elementName).first());
+ }
+
+ return waitForCondition(condition, timeout)(this.currentPage.getElement(elementName));
+});
+
+When(/^I scroll to the "([^"]*)" element$/, function(elementName) {
+ return this.currentPage.scrollIntoElement(elementName);
+});
+
+When(/^I click the "([^"]*)" element$/, function(elementName) {
+ return this.currentPage
+ .scrollIntoElement(elementName)
+ .catch(() => Promise.resolve())
+ .then(() => this.currentPage.waitForVisibilityOf(elementName))
+ .then(() => this.currentPage.scrollIntoElement(elementName))
+ .then(() => this.currentPage.click(elementName))
+ .catch(() => {
+ return waitForCondition('elementToBeClickable', timeout)(this.currentPage.getElement(elementName)).then(() => {
+ return this.currentPage.click(elementName);
+ });
+ })
+ .catch(() => {
+ console.warn('Warning! Element was not clickable. We need to scroll it down.');
+ return browser
+ .executeScript('window.scrollBy(0,50);')
+ .then(() => this.currentPage.waitForVisibilityOf(elementName))
+ .then(() => this.currentPage.click(elementName));
+ })
+ .catch(() => {
+ console.warn('Warning! Element was not clickable. We need use the WebDriver method to perform the click action.');
+ return browser
+ .actions()
+ .mouseMove(this.currentPage.getElement(elementName))
+ .mouseMove({ x: 5, y: 0 })
+ .click()
+ .perform();
+ })
+ .catch(() => {
+ return Promise.reject(`Error, after scrolling the element "${elementName}" is still not clickable.`);
+ });
+});
+
+When(/^I store the "([^"]*)" element text as "([^"]*)" variable$/, function(elementName, variable) {
+ return this.currentPage.waitForVisibilityOf(elementName).then(async () => {
+ const elementTag = await this.currentPage[elementName].getTagName(tag => tag);
+
+ if (elementTag === 'input' || elementTag === 'textarea') {
+ return this.currentPage
+ .getElement(elementName)
+ .getAttribute('value')
+ .then(value => {
+ variableStore.storeVariable(variable, value);
+ });
+ }
+
+ return this.currentPage
+ .getElement(elementName)
+ .getText()
+ .then(text => {
+ variableStore.storeVariable(variable, text);
+ });
+ });
+});
+
+When(/^I update the "([^"]*)" element text as "([^"]*)" variable$/, function(elementName, variable) {
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ this.currentPage
+ .getElement(elementName)
+ .getText()
+ .then(text => {
+ variableStore.updateVariable(variable, text);
+ });
+ });
+});
+
+When(/^I store the "([^"]*)" element text matched by "([^"]*)" as "([^"]*)" variable$/, function(
+ elementName,
+ matcher,
+ variable
+) {
+ const regex = regexBuilder.buildRegex(matcher);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return this.currentPage
+ .getElement(elementName)
+ .getText()
+ .then(text => {
+ const matchedText = text.match(regex);
+
+ if (matchedText === null) {
+ return Promise.reject(`Could not match text ${text} with matcher ${matcher}`);
+ }
+
+ if (matchedText.length <= 1) {
+ return Promise.reject(`Matcher ${matcher} does not contain capturing brackets`);
+ }
+
+ variableStore.storeVariable(variable, matchedText[1]);
+ });
+ });
+});
+
+When(/^I wait for the "([^"]*)" element to disappear$/, function(elementName, sync) {
+ const self = this;
+ let maxRepeats = 10;
+
+ const interval = setInterval(() => {
+ console.log('Waiting for element to disappear...');
+
+ return self.currentPage.isPresent(elementName).then(isPresent => {
+ if (!isPresent) {
+ clearInterval(interval);
+ sync();
+ return;
+ }
+
+ maxRepeats--;
+
+ if (maxRepeats === 0) {
+ clearInterval(interval);
+ sync('Element is still visible');
+ }
+ });
+ }, 1500);
+});
+
+Then(/^the "([^"]*)" element is visible$/, function(elementName) {
+ return this.currentPage.isVisible(elementName);
+});
+
+Then(/^the "([^"]*)" element is not visible$/, function(elementName) {
+ return this.currentPage
+ .isVisible(elementName)
+ .then(isVisible => Promise.reject(isVisible))
+ .catch(isVisible => {
+ if (isVisible === true) {
+ return Promise.reject(`Element '${elementName}' should not be visible.`);
+ }
+
+ return Promise.resolve();
+ });
+});
+
+Then(/^the "([^"]*)" element is disabled$/, async function(elementName) {
+ return await expect(this.currentPage.isDisabled(elementName)).resolves.toBe(true);
+});
+
+When(/^I store table "([^"]*)" rows as "([^"]*)" with columns:$/, function(table, variableName, data) {
+ const self = this;
+ const columns = data.raw().map(element => element[0]);
+ const promises = [];
+ return this.currentPage.waitForVisibilityOf(table).then(() => {
+ return this.currentPage
+ .getElement(table)
+ .each(element => {
+ const rowPromises = [];
+
+ for (const columnIndex in columns) {
+ if (columns.hasOwnProperty(columnIndex)) {
+ rowPromises.push(element.element(self.currentPage.getElement(columns[columnIndex]).locator()).getText());
+ }
+ }
+
+ promises.push(Promise.all(rowPromises));
+ })
+ .then(() =>
+ Promise.all(promises).then(resolvedPromises => {
+ variableStore.storeVariable(variableName, resolvedPromises);
+ })
+ );
+ });
+});
+
+Then(/^there are following elements in table "([^"]*)":$/, function(table, data) {
+ const self = this;
+ const allElements = this.currentPage.getElements(table);
+ const hashes = data.hashes();
+ return this.currentPage.waitForVisibilityOf(table).then(() => {
+ return checkNumberOfElements.call(this, `equal ${hashes.length}`, table).then(() => {
+ const promises = [];
+
+ return allElements
+ .each((element, index) => {
+ const hash = hashes[index];
+
+ for (const prop in hash) {
+ if (hash.hasOwnProperty(prop)) {
+ const propValue = hash[prop];
+
+ promises.push(
+ matchers.match(
+ element.element(self.currentPage.getElement(prop).locator()),
+ variableStore.replaceTextVariables(propValue)
+ )
+ );
+ }
+ }
+ })
+ .then(() => Promise.all(promises));
+ });
+ });
+});
+
+Then(/^there are "([^"]*)" following elements for element "([^"]*)":$/, function(numberExpression, elementName, data) {
+ const self = this;
+ const allElements = this.currentPage.getElements(elementName);
+ const hashedData = data.raw();
+
+ if (hashedData.length === 0) {
+ return Promise.reject('Missing table under the step.');
+ }
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return checkNumberOfElements.call(this, numberExpression, elementName).then(() => {
+ const promises = [];
+
+ return allElements
+ .each(element => {
+ hashedData.forEach(hash => {
+ promises.push(
+ matchers.match(
+ element.element(self.currentPage.getElement(hash[0]).locator()),
+ variableStore.replaceTextVariables(hash[1])
+ )
+ );
+ });
+ })
+ .then(() => Promise.all(promises));
+ });
+ });
+});
+
+Then(/^there are "([^"]*)" dropdown list elements with following options:$/, function(elementName, data) {
+ const allOptionElements = this.currentPage.getElement(elementName);
+ const hashedData = data.raw();
+
+ if (hashedData.length === 0) {
+ return Promise.reject('Missing table under the step.');
+ }
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ allOptionElements.getText().then(textArray => {
+ if (textArray.length === hashedData.length) {
+ hashedData.forEach(hash => {
+ textArray.splice(textArray.indexOf(hash), 1);
+ });
+ } else {
+ return Promise.reject("Number of options doesn't match the number of asked");
+ }
+ expect(textArray.length).toEqual(0);
+ });
+ });
+});
+
+Then(/^there is element "([^"]*)" with value "([^"]*)"$/, function(elementName, value) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(value))
+ .then(matcherResult => expect(matcherResult).toBe(true));
+ });
+});
+
+Then(/^there is no element "([^"]*)" with value "([^"]*)"$/, function(elementName, value) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(value))
+ .catch(() => Promise.resolve(false))
+ .then(result => (result ? Promise.reject() : Promise.resolve()));
+});
+
+Then(/^there is element "([^"]*)" containing "([^"]*)" text$/, function(elementName, value) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers.match(pageElement, variableStore.replaceTextVariables(`t:${value}`));
+ });
+});
+
+Then(/^there is no element "([^"]*)" containing "([^"]*)" text$/, function(elementName, value) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(`t:${value}`))
+ .catch(() => Promise.resolve(false))
+ .then(result => (result ? Promise.reject() : Promise.resolve()));
+});
+
+Then(/^there is element "([^"]*)" matching "([^"]*)" matcher$/, function(elementName, matcher) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(`f:${matcher}`))
+ .then(matcherResult => expect(matcherResult).toBe(true));
+ });
+});
+
+Then(/^there is no element "([^"]*)" matching "([^"]*)" matcher$/, function(elementName, matcher) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(`f:${matcher}`))
+ .catch(() => Promise.resolve(false))
+ .then(result => (result ? Promise.reject() : Promise.resolve()));
+ });
+});
+
+Then(/^there is element "([^"]*)" with "([^"]*)" regex$/, function(elementName, matcher) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(`r:${matcher}`))
+ .then(matcherResult => expect(matcherResult).toBe(true));
+ });
+});
+
+Then(/^there is no element "([^"]*)" with "([^"]*)" regex$/, function(elementName, matcher) {
+ const pageElement = this.currentPage.getElement(elementName);
+
+ return this.currentPage.waitForVisibilityOf(elementName).then(() => {
+ return matchers
+ .match(pageElement, variableStore.replaceTextVariables(`r:${matcher}`))
+ .catch(() => Promise.resolve(false))
+ .then(result => (result ? Promise.reject() : Promise.resolve()));
+ });
+});
+
+Then(/^there are "([^"]*)" "([^"]*)" elements$/, checkNumberOfElements);
+
+Then(/^every "([^"]*)" element should have the same value for element "([^"]*)"$/, function(
+ containerName,
+ elementName
+) {
+ const self = this;
+ return this.currentPage.waitForVisibilityOf(containerName).then(() => {
+ return this.currentPage
+ .getElements(containerName)
+ .first()
+ .element(self.currentPage.getElement(elementName).locator())
+ .getText()
+ .then(firstElementText => {
+ return self.currentPage.getElements(containerName).each(containerElement => {
+ containerElement
+ .element(self.currentPage.getElement(elementName).locator())
+ .getText()
+ .then(elementText => {
+ expect(elementText).toEqual(firstElementText);
+ });
+ });
+ });
+ });
+});
+
+Then(/^the element "([^"]*)" should have an item with values:$/, function(elementName, data) {
+ const self = this;
+ const allElements = this.currentPage.getElements(elementName);
+ const hashedData = data.raw();
+
+ if (hashedData.length === 0) {
+ return Promise.reject('Missing table under the step.');
+ }
+
+ const promises = [];
+ return this.currentPage
+ .waitForVisibilityOf(elementName)
+ .then(() =>
+ allElements.each(element => {
+ hashedData.forEach(hash => {
+ promises.push(
+ matchers
+ .match(
+ element.element(self.currentPage.getElement(hash[0]).locator()),
+ variableStore.replaceTextVariables(hash[1])
+ )
+ .catch(() => false)
+ );
+ });
+ })
+ )
+ .then(() =>
+ Promise.all(promises).then(
+ handlePromises(hashedData, () => Promise.resolve(), () => Promise.reject('No matching element has been found.'))
+ )
+ );
+});
+
+Then(/^the element "([^"]*)" should not have an item with values:$/, function(elementName, data) {
+ const self = this;
+ const allElements = this.currentPage.getElements(elementName);
+ const hashedData = data.raw();
+
+ if (hashedData.length === 0) {
+ return Promise.reject('Missing table under the step.');
+ }
+
+ const promises = [];
+
+ return allElements
+ .each(element => {
+ hashedData.forEach(hash => {
+ promises.push(
+ matchers
+ .match(
+ element.element(self.currentPage.getElement(hash[0]).locator()),
+ variableStore.replaceTextVariables(hash[1])
+ )
+ .catch(() => false)
+ );
+ });
+ })
+ .then(() =>
+ Promise.all(promises).then(
+ handlePromises(hashedData, () => Promise.reject('Matching element has been found'), () => Promise.resolve())
+ )
+ );
+});
+
+Then(/^"([^"]*)" value on the "([^"]*)" list is sorted in "([^"]*)" order$/, function(
+ elementValue,
+ elementList,
+ dependency
+) {
+ const self = this;
+ const promise = [];
+
+ return this.currentPage.waitForVisibilityOf(elementList).then(() => {
+ return self.currentPage
+ .getElements(elementList)
+ .each(singleElement => {
+ promise.push(singleElement.element(self.currentPage.getElement(elementValue).locator()).getText());
+ })
+ .then(() => Promise.all(promise))
+ .then(elementsValues => comparators.compare(elementsValues, dependency));
+ });
+});
+
+When(/^I infinitely scroll to the "([^"]*)" element$/, function(elementName) {
+ const self = this;
+
+ const scrollToLoader = () => {
+ return self.currentPage
+ .isPresent(elementName)
+ .then(isPresent => {
+ if (isPresent) {
+ return self.currentPage.scrollIntoElement(elementName);
+ }
+
+ return Promise.resolve();
+ })
+ .then(() => self.currentPage.isPresent(elementName))
+ .then(isPresent => {
+ if (isPresent) {
+ return browser.sleep(1000).then(() => scrollToLoader());
+ }
+
+ return Promise.resolve();
+ });
+ };
+
+ return scrollToLoader();
+});
+
+When(/^I press the "([^"]*)" key$/, key => {
+ const keyTransformed = key.toUpperCase();
+
+ return Promise.resolve(
+ browser
+ .actions()
+ .sendKeys(protractor.Key[keyTransformed])
+ .perform()
+ );
+});
+
+When(/^I drag "([^"]*)" element and drop over "([^"]*)" element$/, async function(elementDrag, elementDrop) {
+ const wait = timeToWait => browser.sleep(timeToWait);
+
+ await this.currentPage.waitForVisibilityOf(elementDrag);
+ await browser
+ .actions()
+ .mouseMove(this.currentPage.getElement(elementDrag))
+ .perform();
+ await wait(200);
+ await browser
+ .actions()
+ .mouseDown()
+ .perform();
+ await wait(200);
+ await browser
+ .actions()
+ .mouseMove(this.currentPage.getElement(elementDrop))
+ .perform();
+ await wait(200);
+ await browser
+ .actions()
+ .mouseUp()
+ .perform();
+});
diff --git a/src/step_definitions/email.js b/src/step_definitions/email.js
deleted file mode 100644
index 6031dc76..00000000
--- a/src/step_definitions/email.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import sugar from 'sugar-date';
-import { filters } from '../emails/filters';
-import { regexBuilder } from '../matchers';
-import config from '../core/config.helper';
-
-import { emailService } from '../emails';
-
-defineSupportCode(function({ Then }) {
- function stopInterval(interval, callback) {
- clearInterval(interval);
- callback();
- }
-
- function checkAttachmentsInEmail(email, filesExtensions, attachments) {
- let fileAttachments = attachments.filter(attachment => attachment.attachment_type === 'attachment');
-
- const missingFiles = filesExtensions.reduce((previous, current) => {
- const expectedFile = fileAttachments.find(attachment => {
- return (
- regexBuilder.buildRegex(current.name).test(attachment.filename) &&
- regexBuilder.buildRegex(current.type).test(attachment.content_type) &&
- attachment.attachment_size >= current.minimalSize
- );
- });
-
- if (typeof expectedFile === 'undefined') {
- previous.push(current);
- return previous;
- }
-
- fileAttachments = fileAttachments.filter(attachment => attachment.id !== expectedFile.id);
-
- return previous;
- }, []);
-
- if (missingFiles.length === 0) {
- return emailService.markAsRead(email);
- }
-
- return Promise.reject('Some attachments not found: ' + missingFiles.map(file => file.name).join(', '));
- }
-
- function filterEmails(emails, data) {
- let originalEmails = emails;
- const checks = data.raw().filter(elem => elem[0] !== 'file');
-
- for (let i = 0; i < checks.length; i++) {
- const checkType = checks[i][0];
- const checkValue = checks[i][1];
-
- originalEmails = filters.filter(originalEmails, checkType, checkValue, this);
- }
-
- return originalEmails;
- }
-
- function getFilesExtensions(data) {
- return data
- .raw()
- .filter(elem => elem[0] === 'file')
- .map(elem => {
- return { name: elem[1], type: elem[2], minimalSize: elem[3] };
- });
- }
-
- function rejectIfMaxRepeatsReached(filteredEmails, maxRepeats) {
- if (filteredEmails.length === 0 && maxRepeats === 0) {
- return Promise.reject('No emails found and maximum repeats reached');
- }
-
- return filteredEmails;
- }
-
- function rejectIfMoreThanOneEmailFound(filteredEmails) {
- if (filteredEmails.length > 1) {
- return Promise.reject('More than one email found');
- }
-
- return filteredEmails;
- }
-
- function rejectIfEmailFound(filteredEmails) {
- if (filteredEmails.length > 0) {
- return Promise.reject('Email has been found!');
- }
-
- return filteredEmails;
- }
-
- function validateEmailDate(filteredEmails) {
- if (filteredEmails.length === 1) {
- if (sugar.Date.minutesFromNow(sugar.Date.create(filteredEmails[0].created_at)) < -10) {
- return Promise.reject(
- 'Email was sent more than 10 minutes ago. This is probably not what you are looking for.'
- );
- }
- }
-
- return filteredEmails;
- }
-
- function validateEmailContentAndAttachments(filteredEmails, data, interval, sync) {
- if (filteredEmails.length === 1) {
- const filesExtensions = getFilesExtensions(data);
-
- if (filesExtensions.length > 0) {
- return emailService
- .getAttachments(filteredEmails[0])
- .then(checkAttachmentsInEmail.bind(null, filteredEmails[0], filesExtensions))
- .then(stopInterval.bind(null, interval, sync));
- }
- return emailService.markAsRead(filteredEmails[0]).then(stopInterval.bind(null, interval, sync));
- }
- }
-
- Then(/^the email has been sent and contains:$/, function(data, sync) {
- const self = this;
- const timeout = parseInt(config.intervalEmail) * 1000;
- let maxRepeats = parseInt(config.maxEmailRepeats);
-
- config.maxEmailRepeats === undefined ? (maxRepeats = 5) : maxRepeats;
-
- const interval = setInterval(() => {
- console.log('Checking mailbox for email...');
-
- emailService
- .getEmails()
- .then(emails => filterEmails.call(self, emails, data))
- .then(filteredEmails => rejectIfMaxRepeatsReached(filteredEmails, maxRepeats))
- .then(filteredEmails => rejectIfMoreThanOneEmailFound(filteredEmails))
- .then(filteredEmails => validateEmailDate(filteredEmails))
- .then(filteredEmails => validateEmailContentAndAttachments(filteredEmails, data, interval, sync))
- .then(() => maxRepeats--)
- .catch(err => stopInterval(interval, sync.bind(null, err)));
- }, timeout);
- });
-
- Then(/^the email with the following data has not been sent:$/, function(data, sync) {
- const self = this;
- const timeout = parseInt(config.intervalEmail) * 1000;
- let maxRepeats = 5;
-
- const interval = setInterval(() => {
- console.log('Checking mailbox for email...');
-
- emailService
- .getEmails()
- .then(emails => filterEmails.call(self, emails, data))
- .then(filteredEmails => rejectIfEmailFound(filteredEmails))
- .then(filteredEmails => rejectIfMaxRepeatsReached(filteredEmails, maxRepeats))
- .then(() => maxRepeats--)
- .catch(err => {
- err === 'No emails found and maximum repeats reached'
- ? stopInterval(interval, sync)
- : stopInterval(interval, sync.bind(null, err));
- });
- }, timeout);
- });
-});
diff --git a/src/step_definitions/email.ts b/src/step_definitions/email.ts
new file mode 100644
index 00000000..761598e8
--- /dev/null
+++ b/src/step_definitions/email.ts
@@ -0,0 +1,152 @@
+import { Then } from 'cucumber';
+import * as sugar from 'sugar-date/index';
+import config from '../core/config.helper';
+import { filters } from '../emails/filters';
+import { regexBuilder } from '../matchers';
+
+import { emailService } from '../emails';
+
+function stopInterval(interval, callback) {
+ clearInterval(interval);
+ callback();
+}
+
+function checkAttachmentsInEmail(email, filesExtensions, attachments) {
+ let fileAttachments = attachments.filter(attachment => attachment.attachment_type === 'attachment');
+
+ const missingFiles = filesExtensions.reduce((previous, current) => {
+ const expectedFile = fileAttachments.find(attachment => {
+ return (
+ regexBuilder.buildRegex(current.name).test(attachment.filename) &&
+ regexBuilder.buildRegex(current.type).test(attachment.content_type) &&
+ attachment.attachment_size >= current.minimalSize
+ );
+ });
+
+ if (typeof expectedFile === 'undefined') {
+ previous.push(current);
+ return previous;
+ }
+
+ fileAttachments = fileAttachments.filter(attachment => attachment.id !== expectedFile.id);
+
+ return previous;
+ }, []);
+
+ if (missingFiles.length === 0) {
+ return emailService.markAsRead(email);
+ }
+
+ return Promise.reject('Some attachments not found: ' + missingFiles.map(file => file.name).join(', '));
+}
+
+function filterEmails(emails, data) {
+ let originalEmails = emails;
+ const checks = data.raw().filter(elem => elem[0] !== 'file');
+
+ for (const check of checks) {
+ const checkType = check[0];
+ const checkValue = check[1];
+
+ originalEmails = filters.filter(originalEmails, checkType, checkValue, this);
+ }
+
+ return originalEmails;
+}
+
+function getFilesExtensions(data) {
+ return data
+ .raw()
+ .filter(elem => elem[0] === 'file')
+ .map(elem => {
+ return { name: elem[1], type: elem[2], minimalSize: elem[3] };
+ });
+}
+
+function rejectIfMaxRepeatsReached(filteredEmails, maxRepeats) {
+ if (filteredEmails.length === 0 && maxRepeats === 0) {
+ return Promise.reject('No emails found and maximum repeats reached');
+ }
+
+ return filteredEmails;
+}
+
+function rejectIfMoreThanOneEmailFound(filteredEmails) {
+ if (filteredEmails.length > 1) {
+ return Promise.reject('More than one email found');
+ }
+
+ return filteredEmails;
+}
+
+function rejectIfEmailFound(filteredEmails) {
+ if (filteredEmails.length > 0) {
+ return Promise.reject('Email has been found!');
+ }
+
+ return filteredEmails;
+}
+
+function validateEmailDate(filteredEmails) {
+ if (filteredEmails.length === 1 && sugar.Date.minutesFromNow(sugar.Date.create(filteredEmails[0].created_at)) < -10) {
+ return Promise.reject('Email was sent more than 10 minutes ago. This is probably not what you are looking for.');
+ }
+
+ return filteredEmails;
+}
+
+function validateEmailContentAndAttachments(filteredEmails, data, interval, sync) {
+ if (filteredEmails.length === 1) {
+ const filesExtensions = getFilesExtensions(data);
+
+ if (filesExtensions.length > 0) {
+ return emailService
+ .getAttachments(filteredEmails[0])
+ .then(checkAttachmentsInEmail.bind(null, filteredEmails[0], filesExtensions))
+ .then(stopInterval.bind(null, interval, sync));
+ }
+ return emailService.markAsRead(filteredEmails[0]).then(stopInterval.bind(null, interval, sync));
+ }
+}
+
+Then(/^the email has been sent and contains:$/, function(data, sync) {
+ const self = this;
+ const timeout = parseInt(config.intervalEmail) * 1000;
+ let maxRepeats = config.maxEmailRepeats === undefined ? 5 : parseInt(config.maxEmailRepeats);
+
+ const interval = setInterval(() => {
+ console.log('Checking mailbox for email...');
+
+ emailService
+ .getEmails()
+ .then(emails => filterEmails.call(self, emails, data))
+ .then(filteredEmails => rejectIfMaxRepeatsReached(filteredEmails, maxRepeats))
+ .then(filteredEmails => rejectIfMoreThanOneEmailFound(filteredEmails))
+ .then(filteredEmails => validateEmailDate(filteredEmails))
+ .then(filteredEmails => validateEmailContentAndAttachments(filteredEmails, data, interval, sync))
+ .then(() => maxRepeats--)
+ .catch(err => stopInterval(interval, sync.bind(null, err)));
+ }, timeout);
+});
+
+Then(/^the email with the following data has not been sent:$/, function(data, sync) {
+ const self = this;
+ const timeout = parseInt(config.intervalEmail) * 1000;
+ let maxRepeats = 5;
+
+ const interval = setInterval(() => {
+ console.log('Checking mailbox for email...');
+
+ emailService
+ .getEmails()
+ .then(emails => filterEmails.call(self, emails, data))
+ .then(filteredEmails => rejectIfEmailFound(filteredEmails))
+ .then(filteredEmails => rejectIfMaxRepeatsReached(filteredEmails, maxRepeats))
+ .then(() => maxRepeats--)
+ .catch(err => {
+ err === 'No emails found and maximum repeats reached'
+ ? stopInterval(interval, sync)
+ : stopInterval(interval, sync.bind(null, err));
+ });
+ }, timeout);
+});
diff --git a/src/step_definitions/file.js b/src/step_definitions/file.js
deleted file mode 100644
index 5a381eb7..00000000
--- a/src/step_definitions/file.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import fileManager from '../web/fs/file-manager.helper';
-import variableStore from '../web/variable-store.helper';
-
-defineSupportCode(function({ Then }) {
- Then(/^the file "([^"]*)" should be downloaded$/, function(filename) {
- return fileManager.wasDownloaded(variableStore.replaceTextVariables(filename));
- });
-
- Then(/^the file "([^"]*)" contains table data stored under "([^"]*)" variable$/, function(filename, variableName) {
- const file = fileManager.parseXLS(variableStore.replaceTextVariables(filename));
- const storedData = variableStore.getVariableValue(variableName);
- const rows = file.filter((row, index) => row.length > 0 && index > 0);
-
- const findIndexes = () => {
- const allFoundIndexesInRows = [];
-
- storedData.forEach(storedItems => {
- const foundIndexesInRow = [];
- let previousFoundIndex = null;
-
- storedItems.forEach(storedValue => {
- for (const index in rows) {
- if (storedValue.match(/^\d+$/)) {
- if (previousFoundIndex !== null) {
- foundIndexesInRow.push(rows[previousFoundIndex].indexOf(parseInt(storedValue)));
- break;
- }
-
- if (rows[index].includes(parseInt(storedValue))) {
- previousFoundIndex = index;
- foundIndexesInRow.push(rows[index].indexOf(parseInt(storedValue)));
- break;
- }
- }
-
- if (previousFoundIndex !== null) {
- foundIndexesInRow.push(rows[previousFoundIndex].indexOf(storedValue));
- break;
- }
-
- if (rows[index].includes(storedValue)) {
- previousFoundIndex = index;
- foundIndexesInRow.push(rows[index].indexOf(storedValue));
- break;
- }
- }
- });
-
- allFoundIndexesInRows.push(foundIndexesInRow);
- });
-
- return Promise.resolve(allFoundIndexesInRows);
- };
-
- return findIndexes().then(allFoundIndexes => {
- if (allFoundIndexes[0].length !== storedData[0].length) {
- return Promise.reject('Values not found!');
- }
-
- if (allFoundIndexes.length === 1) {
- return Promise.resolve();
- }
-
- for (let index = 1; index < allFoundIndexes.length; index++) {
- if (JSON.stringify(allFoundIndexes[index]) !== JSON.stringify(allFoundIndexes[index - 1])) {
- return Promise.reject('Arrays are different!');
- }
- }
- });
- });
-});
diff --git a/src/step_definitions/file.ts b/src/step_definitions/file.ts
new file mode 100644
index 00000000..eb0ad639
--- /dev/null
+++ b/src/step_definitions/file.ts
@@ -0,0 +1,72 @@
+import { Then } from 'cucumber';
+import fileManager from '../web/fs/file-manager.helper';
+import variableStore from '../web/variable-store.helper';
+
+Then(/^the file "([^"]*)" should be downloaded$/, filename => {
+ return fileManager.wasDownloaded(variableStore.replaceTextVariables(filename));
+});
+
+Then(/^the file "([^"]*)" contains table data stored under "([^"]*)" variable$/, (filename, variableName) => {
+ const file = fileManager.parseXLS(variableStore.replaceTextVariables(filename));
+ const storedData = variableStore.getVariableValue(variableName);
+ const rows = file.filter((row, index) => row.length > 0 && index > 0);
+
+ const findIndexes = () => {
+ const allFoundIndexesInRows = [];
+
+ storedData.forEach(storedItems => {
+ const foundIndexesInRow = [];
+ let previousFoundIndex = null;
+
+ storedItems.forEach(storedValue => {
+ for (const index in rows) {
+ if (rows.hasOwnProperty(index)) {
+ if (storedValue.match(/^\d+$/)) {
+ if (previousFoundIndex !== null) {
+ foundIndexesInRow.push(rows[previousFoundIndex].indexOf(parseInt(storedValue)));
+ break;
+ }
+
+ if (rows[index].includes(parseInt(storedValue))) {
+ previousFoundIndex = index;
+ foundIndexesInRow.push(rows[index].indexOf(parseInt(storedValue)));
+ break;
+ }
+ }
+
+ if (previousFoundIndex !== null) {
+ foundIndexesInRow.push(rows[previousFoundIndex].indexOf(storedValue));
+ break;
+ }
+
+ if (rows[index].includes(storedValue)) {
+ previousFoundIndex = index;
+ foundIndexesInRow.push(rows[index].indexOf(storedValue));
+ break;
+ }
+ }
+ }
+ });
+
+ allFoundIndexesInRows.push(foundIndexesInRow);
+ });
+
+ return Promise.resolve(allFoundIndexesInRows);
+ };
+
+ return findIndexes().then(allFoundIndexes => {
+ if (allFoundIndexes[0].length !== storedData[0].length) {
+ return Promise.reject('Values not found!');
+ }
+
+ if (allFoundIndexes.length === 1) {
+ return Promise.resolve();
+ }
+
+ for (let index = 1; index < allFoundIndexes.length; index++) {
+ if (JSON.stringify(allFoundIndexes[index]) !== JSON.stringify(allFoundIndexes[index - 1])) {
+ return Promise.reject('Arrays are different!');
+ }
+ }
+ });
+});
diff --git a/src/step_definitions/form.js b/src/step_definitions/form.js
deleted file mode 100644
index 248f732e..00000000
--- a/src/step_definitions/form.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import { dictionaries } from '../dictionaries';
-
-defineSupportCode(function({ When, Then }) {
- When(/^I fill the "([^"]*)" form with:$/, function(formName, data) {
- const self = this;
-
- return this.currentPage.waitForVisibilityOf(formName).then(function() {
- return expect(self.currentPage.isVisible(formName)).to.eventually.be.fulfilled.then(function() {
- return self.currentPage.fillForm(data.raw());
- });
- });
- });
-
- Then(/^the "([^"]*)" form is filled with:$/, function(formName, data) {
- const self = this;
-
- return this.currentPage.waitForVisibilityOf(formName).then(function() {
- return expect(self.currentPage.isVisible(formName)).to.eventually.be.fulfilled.then(function() {
- return self.currentPage.checkForm(data.raw());
- });
- });
- });
-
- Then(/^the error messages should be displayed:$/, function(data) {
- const self = this;
- const table = data.rows();
-
- const promise = [];
-
- table.forEach(function(item) {
- promise.push(
- expect(self.currentPage.isVisible(item[0])).to.eventually.be.fulfilled.then(function() {
- return self.currentPage[item[0]].getText().then(function(text) {
- if (text.indexOf(dictionaries.findMappedValueByPhrase(item[1])) >= 0) {
- return Promise.resolve();
- }
-
- return Promise.reject(
- `Error "${dictionaries.findMappedValueByPhrase(item[1])}" for element "${item[0]}" was not found.`
- );
- });
- })
- );
- });
-
- return Promise.all(promise);
- });
-});
diff --git a/src/step_definitions/form.ts b/src/step_definitions/form.ts
new file mode 100644
index 00000000..b78d0450
--- /dev/null
+++ b/src/step_definitions/form.ts
@@ -0,0 +1,40 @@
+import { When, Then } from 'cucumber';
+import { dictionaries } from '../dictionaries';
+
+When(/^I fill the "([^"]*)" form with:$/, function(formName, data) {
+ const self = this;
+
+ return this.currentPage.waitForVisibilityOf(formName).then(() => self.currentPage.fillForm(data.raw()));
+});
+
+Then(/^the "([^"]*)" form is filled with:$/, function(formName, data) {
+ const self = this;
+
+ return this.currentPage.waitForVisibilityOf(formName).then(() => self.currentPage.checkForm(data.raw()));
+});
+
+Then(/^the error messages should be displayed:$/, function(data) {
+ const self = this;
+ const table = data.rows();
+
+ const promise = [];
+
+ table.forEach(item => {
+ promise.push(
+ self.currentPage
+ .waitForVisibilityOf(item[0])
+ .then(() => self.currentPage[item[0]].getText())
+ .then(text => {
+ if (text.indexOf(dictionaries.findMappedValueByPhrase(item[1])) >= 0) {
+ return Promise.resolve();
+ }
+
+ return Promise.reject(
+ `Error "${dictionaries.findMappedValueByPhrase(item[1])}" for element "${item[0]}" was not found.`
+ );
+ })
+ );
+ });
+
+ return Promise.all(promise);
+});
diff --git a/src/step_definitions/generators.js b/src/step_definitions/generators.js
deleted file mode 100644
index 17d95202..00000000
--- a/src/step_definitions/generators.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import variableStore from '../web/variable-store.helper';
-import { transformers } from '../transformers';
-
-defineSupportCode(function({ When }) {
- When(/^I generate random "([^"]*)" as "([^"]*)"$/, function(generator, variableName) {
- return transformers.transform(`g:${generator}`).then(result => variableStore.storeVariable(variableName, result));
- });
-});
diff --git a/src/step_definitions/generators.ts b/src/step_definitions/generators.ts
new file mode 100644
index 00000000..a1ddf5ee
--- /dev/null
+++ b/src/step_definitions/generators.ts
@@ -0,0 +1,7 @@
+import { When } from 'cucumber';
+import { transformers } from '../transformers';
+import variableStore from '../web/variable-store.helper';
+
+When(/^I generate random "([^"]*)" as "([^"]*)"$/, (generator, variableName) => {
+ return transformers.transform(`g:${generator}`).then(result => variableStore.storeVariable(variableName, result));
+});
diff --git a/src/step_definitions/navigation.js b/src/step_definitions/navigation.js
deleted file mode 100644
index 92aac10f..00000000
--- a/src/step_definitions/navigation.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-
-defineSupportCode(function({ Then, Given }) {
- Given(/^I visit the "([^"]*)" page$/, function(pageName) {
- expect(browser.page[pageName]).to.not.be.undefined;
-
- this.currentPage = browser.page[pageName];
-
- return this.currentPage.visit();
- });
-
- Given(/^I visit the "([^"]*)" page with parameters:$/, function(pageName, data) {
- expect(browser.page[pageName]).to.not.be.undefined;
-
- this.currentPage = browser.page[pageName];
-
- return this.currentPage.visitWithParameters(data);
- });
-
- Then(/^the "([^"]*)" page is displayed$/, function(pageName) {
- const self = this;
-
- return browser.page[pageName].isOn().then(checkResult => {
- if (typeof checkResult !== 'object') {
- return Promise.reject('Check result must be an object!!!');
- }
-
- self.currentPage = browser.page[pageName];
- self.urlParameters = checkResult.parameters;
- });
- });
-});
diff --git a/src/step_definitions/navigation.ts b/src/step_definitions/navigation.ts
new file mode 100644
index 00000000..e2b69001
--- /dev/null
+++ b/src/step_definitions/navigation.ts
@@ -0,0 +1,30 @@
+import { Then, Given } from 'cucumber';
+
+Given(/^I visit the "([^"]*)" page$/, function(pageName) {
+ expect(browser.page[pageName]).toBeDefined();
+
+ this.currentPage = browser.page[pageName];
+
+ return this.currentPage.visit();
+});
+
+Given(/^I visit the "([^"]*)" page with parameters:$/, function(pageName, data) {
+ expect(browser.page[pageName]).toBeDefined();
+
+ this.currentPage = browser.page[pageName];
+
+ return this.currentPage.visitWithParameters(data);
+});
+
+Then(/^the "([^"]*)" page is displayed$/, function(pageName) {
+ const self = this;
+
+ return browser.page[pageName].isOn().then(checkResult => {
+ if (typeof checkResult !== 'object') {
+ return Promise.reject('Check result must be an object!!!');
+ }
+
+ self.currentPage = browser.page[pageName];
+ self.urlParameters = checkResult.parameters;
+ });
+});
diff --git a/src/step_definitions/performance.js b/src/step_definitions/performance.js
deleted file mode 100644
index 1a4142c5..00000000
--- a/src/step_definitions/performance.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import { defineSupportCode } from 'cucumber';
-import chalk from 'chalk';
-import config from '../core/config.helper';
-import { create as createAnalyser } from '../web/performance/time-to-first-byte-analyser.helper';
-
-const analyser = createAnalyser();
-const Browsermob = require('browsermob-proxy').Proxy;
-const fs = require('fs');
-let proxy;
-
-defineSupportCode(function({ When, Then }) {
- When(/^I start performance monitor mode$/, function() {
- proxy = new Browsermob({
- port: config.browserMob.serverPort,
- });
-
- let proxyReady = false;
- proxy.start(config.browserMob.port, err => {
- if (!err) {
- proxy.startHAR(config.browserMob.port, 'test', true, true, () => {
- proxyReady = true;
- });
- } else {
- console.error(err);
- }
- });
-
- browser.driver.wait(() => {
- return proxyReady;
- });
- });
-
- When(/^I save performance report file as "([^"]*)"$/, function(fileName) {
- const uniqueFileName = `${fileName}-${Date.now()}.har`;
- let proxyDone = false;
-
- proxy.getHAR(config.browserMob.port, (err, resp) => {
- if (!err) {
- console.log(`har saved at ${uniqueFileName}`);
- fs.writeFileSync(`reports/performance/${uniqueFileName}`, resp, 'utf8');
- } else {
- console.err('Error getting HAR file: ' + err);
- }
- proxy.stop(config.browserMob.port, () => {
- proxyDone = true;
- });
- });
-
- return browser.driver.wait(() => {
- this.performanceReportFile = uniqueFileName;
- return proxyDone;
- });
- });
-
- Then(/^the requests should take a maximum of "([^"]*)" milliseconds$/, function(maxTiming) {
- try {
- const slowRequests = analyser.checkTiming(this.performanceReportFile, parseFloat(maxTiming));
-
- if (slowRequests.length > 0) {
- slowRequests.forEach(({ url, ttfb }) => {
- console.log(
- chalk.white.bgRed(
- '\r\n',
- 'Slow request:',
- '\r\n',
- `URL: ${url}`,
- '\r\n',
- `TTFB: ${ttfb.toFixed(2)} ms`,
- '\r\n'
- )
- );
- });
-
- return Promise.reject('TTFB value is too big! Details available above.');
- }
-
- return Promise.resolve();
- } catch (err) {
- return Promise.reject(err);
- }
- });
-});
diff --git a/src/step_definitions/performance.ts b/src/step_definitions/performance.ts
new file mode 100644
index 00000000..9fb7e5af
--- /dev/null
+++ b/src/step_definitions/performance.ts
@@ -0,0 +1,80 @@
+import chalk from 'chalk';
+import { When, Then } from 'cucumber';
+import config from '../core/config.helper';
+import { create as createAnalyser } from '../web/performance/time-to-first-byte-analyser.helper';
+import * as fs from 'fs';
+import { Proxy as Browsermob } from 'browsermob-proxy';
+
+const analyser = createAnalyser();
+let proxy;
+
+When(/^I start performance monitor mode$/, () => {
+ proxy = new Browsermob({
+ port: config.browserMob.serverPort,
+ });
+
+ let proxyReady = false;
+ proxy.start(config.browserMob.port, err => {
+ if (!err) {
+ proxy.startHAR(config.browserMob.port, 'test', true, true, () => {
+ proxyReady = true;
+ });
+ } else {
+ console.error(err);
+ }
+ });
+
+ browser.driver.wait(() => {
+ return proxyReady;
+ });
+});
+
+When(/^I save performance report file as "([^"]*)"$/, function(fileName) {
+ const uniqueFileName = `${fileName}-${Date.now()}.har`;
+ let proxyDone = false;
+
+ proxy.getHAR(config.browserMob.port, (err, resp) => {
+ if (!err) {
+ console.log(`har saved at ${uniqueFileName}`);
+ fs.writeFileSync(`reports/performance/${uniqueFileName}`, resp, 'utf8');
+ } else {
+ console.err('Error getting HAR file: ' + err);
+ }
+ proxy.stop(config.browserMob.port, () => {
+ proxyDone = true;
+ });
+ });
+
+ return browser.driver.wait(() => {
+ this.performanceReportFile = uniqueFileName;
+ return proxyDone;
+ });
+});
+
+Then(/^the requests should take a maximum of "([^"]*)" milliseconds$/, function(maxTiming) {
+ try {
+ const slowRequests = analyser.checkTiming(this.performanceReportFile, parseFloat(maxTiming));
+
+ if (slowRequests.length > 0) {
+ slowRequests.forEach(({ url, ttfb }) => {
+ console.log(
+ chalk.white.bgRed(
+ '\r\n',
+ 'Slow request:',
+ '\r\n',
+ `URL: ${url}`,
+ '\r\n',
+ `TTFB: ${ttfb.toFixed(2)} ms`,
+ '\r\n'
+ )
+ );
+ });
+
+ return Promise.reject('TTFB value is too big! Details available above.');
+ }
+
+ return Promise.resolve();
+ } catch (err) {
+ return Promise.reject(err);
+ }
+});
diff --git a/src/step_definitions/tabs.js b/src/step_definitions/tabs.js
deleted file mode 100644
index b6482483..00000000
--- a/src/step_definitions/tabs.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const { defineSupportCode } = require('cucumber');
-
-defineSupportCode(({ When }) => {
- When(/^I switch to window number "([^"]*)" of a browser$/, function(tabNumber) {
- return browser.getAllWindowHandles().then(handles => browser.switchTo().window(handles[tabNumber - 1]));
- });
-
- When(/^I close the current browser tab$/, function() {
- return browser
- .close()
- .then(() => browser.getAllWindowHandles())
- .then(tabs => browser.switchTo().window(tabs[0]));
- });
-});
diff --git a/src/step_definitions/tabs.ts b/src/step_definitions/tabs.ts
new file mode 100644
index 00000000..d841313f
--- /dev/null
+++ b/src/step_definitions/tabs.ts
@@ -0,0 +1,12 @@
+import { When } from 'cucumber';
+
+When(/^I switch to window number "([^"]*)" of a browser$/, tabNumber => {
+ return browser.getAllWindowHandles().then(handles => browser.switchTo().window(handles[tabNumber - 1]));
+});
+
+When(/^I close the current browser tab$/, () => {
+ return browser
+ .close()
+ .then(() => browser.getAllWindowHandles())
+ .then(tabs => browser.switchTo().window(tabs[0]));
+});
diff --git a/src/tests/dictionaries/fake-dictionary.js b/src/tests/dictionaries/fake-dictionary.js
deleted file mode 100644
index 803b1b66..00000000
--- a/src/tests/dictionaries/fake-dictionary.js
+++ /dev/null
@@ -1,19 +0,0 @@
-class FakeDictionary {
- constructor() {
- this.values = {
- 'some-key': 'some-value',
- };
-
- this.name = 'fake-dictionary';
- }
-
- isSatisfiedBy(name) {
- return this.name === name;
- }
-
- getMappedValue(key) {
- return this.values[key];
- }
-}
-
-module.exports = new FakeDictionary();
diff --git a/src/tests/dictionaries/fake-dictionary.ts b/src/tests/dictionaries/fake-dictionary.ts
new file mode 100644
index 00000000..0af92260
--- /dev/null
+++ b/src/tests/dictionaries/fake-dictionary.ts
@@ -0,0 +1,11 @@
+import BaseDictionary from '../../dictionaries/base';
+
+class FakeDictionary extends BaseDictionary {
+ constructor() {
+ super('fake-dictionary', {
+ 'some-key': 'some-value',
+ });
+ }
+}
+
+export = new FakeDictionary();
diff --git a/src/tests/init.js b/src/tests/init.ts
similarity index 76%
rename from src/tests/init.js
rename to src/tests/init.ts
index fb07aff7..b10a1040 100644
--- a/src/tests/init.js
+++ b/src/tests/init.ts
@@ -1,4 +1,4 @@
-const protractor = require('protractor');
+import * as protractor from 'protractor';
// set global by to allow recursive call on src directory
global.by = new protractor.ProtractorBy();
diff --git a/src/transformers/index.js b/src/transformers/index.ts
similarity index 100%
rename from src/transformers/index.js
rename to src/transformers/index.ts
diff --git a/src/transformers/transformer.interface.ts b/src/transformers/transformer.interface.ts
new file mode 100644
index 00000000..296b2f77
--- /dev/null
+++ b/src/transformers/transformer.interface.ts
@@ -0,0 +1,4 @@
+export interface Transformer {
+ isSatisfiedBy(prefix: string): boolean;
+ transform(transform: string): any;
+}
diff --git a/src/transformers/transformer/dictionary.transformer.js b/src/transformers/transformer/dictionary.transformer.js
deleted file mode 100644
index db29414a..00000000
--- a/src/transformers/transformer/dictionary.transformer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { dictionaries as dicts } from '../../dictionaries';
-
-class DictionaryTransformer {
- constructor(dictionaries) {
- this.dictionaries = dictionaries;
- }
-
- isSatisfiedBy(prefix) {
- return prefix === 'd:';
- }
-
- transform(value) {
- const splittedValue = value.split(':');
- return this.dictionaries.getMappedValue(splittedValue[0], splittedValue[1]);
- }
-}
-export const createDictionaryTransformer = (dictionaries = dicts) => new DictionaryTransformer(dictionaries);
diff --git a/src/transformers/transformer/dictionary.transformer.spec.js b/src/transformers/transformer/dictionary.transformer.spec.ts
similarity index 91%
rename from src/transformers/transformer/dictionary.transformer.spec.js
rename to src/transformers/transformer/dictionary.transformer.spec.ts
index 5dec8de5..367f22f7 100644
--- a/src/transformers/transformer/dictionary.transformer.spec.js
+++ b/src/transformers/transformer/dictionary.transformer.spec.ts
@@ -1,6 +1,6 @@
import { create as createDictionaries } from '../../dictionaries/dictionaries';
import { createDictionaryTransformer } from './dictionary.transformer';
-import fakeDictionary from '../../tests/dictionaries/fake-dictionary';
+import fakeDictionary = require('../../tests/dictionaries/fake-dictionary');
const dictionaries = createDictionaries();
diff --git a/src/transformers/transformer/dictionary.transformer.ts b/src/transformers/transformer/dictionary.transformer.ts
new file mode 100644
index 00000000..75629ef4
--- /dev/null
+++ b/src/transformers/transformer/dictionary.transformer.ts
@@ -0,0 +1,16 @@
+import { dictionaries as dicts, Dictionaries } from '../../dictionaries';
+import { Transformer } from '../transformer.interface';
+
+class DictionaryTransformer implements Transformer {
+ constructor(private dictionaries: Dictionaries) {}
+
+ public isSatisfiedBy(prefix) {
+ return prefix === 'd:';
+ }
+
+ public transform(value) {
+ const splittedValue = value.split(':');
+ return this.dictionaries.getMappedValue(splittedValue[0], splittedValue[1]);
+ }
+}
+export const createDictionaryTransformer = (dictionaries = dicts) => new DictionaryTransformer(dictionaries);
diff --git a/src/transformers/transformer/generator.transformer.spec.js b/src/transformers/transformer/generator.transformer.spec.ts
similarity index 95%
rename from src/transformers/transformer/generator.transformer.spec.js
rename to src/transformers/transformer/generator.transformer.spec.ts
index 8786d986..205c8397 100644
--- a/src/transformers/transformer/generator.transformer.spec.js
+++ b/src/transformers/transformer/generator.transformer.spec.ts
@@ -14,7 +14,7 @@ describe('Generator transformer', () => {
});
it('returns generated value ', () => {
- const mockedGenerators = {
+ const mockedGenerators: any = {
generate: value => 'my-generated-value',
};
const transformer = createGeneratorTransformer(mockedGenerators);
diff --git a/src/transformers/transformer/generator.transformer.js b/src/transformers/transformer/generator.transformer.ts
similarity index 52%
rename from src/transformers/transformer/generator.transformer.js
rename to src/transformers/transformer/generator.transformer.ts
index 2775d9d8..7c7e244d 100644
--- a/src/transformers/transformer/generator.transformer.js
+++ b/src/transformers/transformer/generator.transformer.ts
@@ -1,15 +1,14 @@
-import { generators } from '../../generators';
+import { generators, Generators } from '../../generators';
+import { Transformer } from '../transformer.interface';
-class GeneratorTransformer {
- constructor(generator) {
- this.generator = generator;
- }
+class GeneratorTransformer implements Transformer {
+ constructor(public generator: Generators) {}
- isSatisfiedBy(prefix) {
+ public isSatisfiedBy(prefix) {
return prefix === 'g:';
}
- transform(value) {
+ public transform(value) {
const splittedValues = value.split(':');
const generatorName = splittedValues[0];
diff --git a/src/transformers/transformer/variable-store.transformer.js b/src/transformers/transformer/variable-store.transformer.js
deleted file mode 100644
index 0d759e9d..00000000
--- a/src/transformers/transformer/variable-store.transformer.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import store from '../../web/variable-store.helper';
-
-class VariableStoreTransformer {
- constructor(variableStore) {
- this.variableStore = variableStore;
- }
-
- isSatisfiedBy(prefix) {
- return prefix === 'v:';
- }
-
- transform(value) {
- return this.variableStore.getVariableValue(value);
- }
-}
-export const createVariableStoreTransformer = (variableStore = store) => new VariableStoreTransformer(variableStore);
diff --git a/src/transformers/transformer/variable-store.transformer.spec.js b/src/transformers/transformer/variable-store.transformer.spec.ts
similarity index 96%
rename from src/transformers/transformer/variable-store.transformer.spec.js
rename to src/transformers/transformer/variable-store.transformer.spec.ts
index 9dd26043..239e0d60 100644
--- a/src/transformers/transformer/variable-store.transformer.spec.js
+++ b/src/transformers/transformer/variable-store.transformer.spec.ts
@@ -2,7 +2,7 @@ import { createVariableStoreTransformer } from './variable-store.transformer';
describe('Variable store transformer', () => {
it('returns replaced text', () => {
- const fakeValue = {
+ const fakeValue: any = {
getVariableValue: () => 'expected value',
};
const transformer = createVariableStoreTransformer(fakeValue);
diff --git a/src/transformers/transformer/variable-store.transformer.ts b/src/transformers/transformer/variable-store.transformer.ts
new file mode 100644
index 00000000..eeff5d71
--- /dev/null
+++ b/src/transformers/transformer/variable-store.transformer.ts
@@ -0,0 +1,16 @@
+import store from '../../web/variable-store.helper';
+import { VariableStore } from '../../web/variable-store.helper';
+import { Transformer } from '../transformer.interface';
+
+class VariableStoreTransformer implements Transformer {
+ constructor(private variableStore: VariableStore) {}
+
+ public isSatisfiedBy(prefix) {
+ return prefix === 'v:';
+ }
+
+ public transform(value) {
+ return this.variableStore.getVariableValue(value);
+ }
+}
+export const createVariableStoreTransformer = (variableStore = store) => new VariableStoreTransformer(variableStore);
diff --git a/src/transformers/transformers.spec.js b/src/transformers/transformers.spec.ts
similarity index 96%
rename from src/transformers/transformers.spec.js
rename to src/transformers/transformers.spec.ts
index 61099931..0ef29bf6 100644
--- a/src/transformers/transformers.spec.js
+++ b/src/transformers/transformers.spec.ts
@@ -10,7 +10,7 @@ describe('Value transformers', () => {
});
it('returns transformed value when expected transformer has been found', () => {
- const fakeTransformer = {
+ const fakeTransformer: any = {
isSatisfiedBy: prefix => prefix === 'v:',
transform: value => {
expect(value).toEqual('value');
diff --git a/src/transformers/transformers.js b/src/transformers/transformers.ts
similarity index 74%
rename from src/transformers/transformers.js
rename to src/transformers/transformers.ts
index 56974379..10c646ea 100644
--- a/src/transformers/transformers.js
+++ b/src/transformers/transformers.ts
@@ -1,13 +1,12 @@
-import { createVariableStoreTransformer } from './transformer/variable-store.transformer';
import { createDictionaryTransformer } from './transformer/dictionary.transformer';
import { createGeneratorTransformer } from './transformer/generator.transformer';
+import { createVariableStoreTransformer } from './transformer/variable-store.transformer';
+import { Transformer } from './transformer.interface';
class Transformers {
- constructor(transformers) {
- this.availableTransformers = transformers;
- }
+ constructor(private availableTransformers: Transformer[]) {}
- transform(value) {
+ public transform(value: string): any {
const transformer = this.findTransformer(value.substr(0, 2));
if (transformer === undefined) {
@@ -17,11 +16,11 @@ class Transformers {
return transformer.transform(value.substr(2));
}
- findTransformer(prefix) {
+ public findTransformer(prefix: string): Transformer {
return this.availableTransformers.find(transformer => transformer.isSatisfiedBy(prefix));
}
- addTransformer(transformer) {
+ public addTransformer(transformer: Transformer): void {
this.availableTransformers.push(transformer);
}
}
diff --git a/src/web/browsers/browsers-config.helper.js b/src/web/browsers/browsers-config.helper.ts
similarity index 69%
rename from src/web/browsers/browsers-config.helper.js
rename to src/web/browsers/browsers-config.helper.ts
index 3de35093..290b05b9 100644
--- a/src/web/browsers/browsers-config.helper.js
+++ b/src/web/browsers/browsers-config.helper.ts
@@ -1,11 +1,11 @@
-import glob from 'glob';
-import path from 'path';
-const { createFirefoxProfile } = require('./create-firefox-profile.helper');
-const { safariBrowserConfigurator } = require('./safari-browser-configurator.helper');
-const { prepareBrowserInstance } = require('../parallel/prepare-browser-instance-specs.helper');
-const { chunkSpecs } = require('../parallel/chunk-specs.helper');
-
-const getDefaultBrowsersConfigs = config => {
+import * as glob from 'glob';
+import * as path from 'path';
+import { createFirefoxProfile } from './create-firefox-profile.helper';
+import { safariBrowserConfigurator } from './safari-browser-configurator.helper';
+import { prepareBrowserInstance } from '../parallel/prepare-browser-instance-specs.helper';
+import { chunkSpecs } from '../parallel/chunk-specs.helper';
+
+const getDefaultBrowsersConfigs = (config): any => {
const chromeConfig = {
browserName: 'chrome',
chromeOptions: {
@@ -36,14 +36,19 @@ const getDefaultBrowsersConfigs = config => {
browserName: 'safari',
};
+ const ieConfig = {
+ browserName: 'internet explorer',
+ };
+
return {
chromeConfig,
firefoxConfig,
safariConfig,
+ ieConfig,
};
};
-const getExtendedBrowsersConfigs = config => {
+const getExtendedBrowsersConfigs = (config, commandArgs): any => {
const configs = getDefaultBrowsersConfigs(config);
if (config.performance) {
@@ -66,7 +71,10 @@ const getExtendedBrowsersConfigs = config => {
];
}
- if (config.headless) {
+ if (
+ (config.headless && commandArgs.headless === undefined) ||
+ (commandArgs.headless && commandArgs.headless !== 'false')
+ ) {
configs.chromeConfig.chromeOptions.args = [
...configs.chromeConfig.chromeOptions.args,
'--headless',
@@ -83,8 +91,8 @@ const getExtendedBrowsersConfigs = config => {
return configs;
};
-const browsersConfiguration = (config, commandArgs) => {
- return async () => {
+export const browsersConfiguration = (config, commandArgs): any => {
+ return () => {
const browsersSettings = [];
const browserConfigs = getExtendedBrowsersConfigs(config, commandArgs);
const allSpecs = glob.sync(config.features.map(file => path.join(config.projectPath, file, '**/*.feature'))[0]);
@@ -108,8 +116,12 @@ const browsersConfiguration = (config, commandArgs) => {
}
};
+ if (commandArgs.browserstack) {
+ return Promise.resolve([prepareBrowserInstance(config.browserstack.capabilities, allSpecs)]);
+ }
+
if (commandArgs.firefox) {
- browserConfigs.firefoxConfig.firefox_profile = await createFirefoxProfile(config);
+ browserConfigs.firefoxConfig.firefox_profile = createFirefoxProfile(config);
pushPreparedBrowserInstance('firefoxConfig');
}
@@ -118,7 +130,14 @@ const browsersConfiguration = (config, commandArgs) => {
pushPreparedBrowserInstance('safariConfig');
}
- if (commandArgs.chrome || (commandArgs.firefox === undefined && commandArgs.safari === undefined)) {
+ if (commandArgs.ie) {
+ pushPreparedBrowserInstance('ieConfig');
+ }
+
+ if (
+ commandArgs.chrome ||
+ (commandArgs.firefox === undefined && commandArgs.safari === undefined && commandArgs.ie === undefined)
+ ) {
pushPreparedBrowserInstance('chromeConfig');
}
@@ -126,4 +145,6 @@ const browsersConfiguration = (config, commandArgs) => {
};
};
-module.exports = browsersConfiguration;
+export const setSeleniumAddress = (commandArgs, config): string => {
+ return commandArgs.browserstack ? config.browserstack.seleniumAddress : '';
+};
diff --git a/src/web/browsers/browserstack-config.helper.ts b/src/web/browsers/browserstack-config.helper.ts
new file mode 100644
index 00000000..15ed1447
--- /dev/null
+++ b/src/web/browsers/browserstack-config.helper.ts
@@ -0,0 +1,37 @@
+import * as browserstack from 'browserstack-local';
+import chalk from 'chalk';
+import * as shell from 'shelljs';
+import config from '../../core/config.helper';
+
+export const disconnectBrowserstack = (browserstackEnabled: boolean) => {
+ if (browserstackEnabled && config.browserstack) {
+ const browserstackPid = shell.exec(`lsof -t -i :${config.browserstack.defaultPort}`).stdout;
+
+ if (browserstackPid.length > 0) {
+ return shell.exec(`kill -9 ${browserstackPid}`);
+ }
+ }
+
+ return Promise.resolve();
+};
+
+export const connectBrowserstack = (browserstackKey: string) => {
+ console.log(
+ chalk.black.bgYellow(
+ 'Keep in mind that Browserstack capabilities cannot be used with the local. Check the documentation for more information!'
+ )
+ );
+
+ disconnectBrowserstack(true);
+
+ return new Promise((resolve, reject) => {
+ const bsLocal = new browserstack.Local();
+ bsLocal.start({ key: browserstackKey }, error => {
+ if (error) {
+ return reject(error);
+ }
+ console.log('Connected to the Browsertack Selenium server! Now testing...');
+ resolve();
+ });
+ });
+};
diff --git a/src/web/browsers/create-firefox-profile.helper.js b/src/web/browsers/create-firefox-profile.helper.ts
similarity index 99%
rename from src/web/browsers/create-firefox-profile.helper.js
rename to src/web/browsers/create-firefox-profile.helper.ts
index d7cc7d94..a895eae5 100644
--- a/src/web/browsers/create-firefox-profile.helper.js
+++ b/src/web/browsers/create-firefox-profile.helper.ts
@@ -1,5 +1,5 @@
-const firefox = require('selenium-webdriver/firefox');
-import path from 'path';
+import * as firefox from 'selenium-webdriver/firefox';
+import * as path from 'path';
export const createFirefoxProfile = config => {
const profile = new firefox.Profile();
@@ -11,12 +11,10 @@ export const createFirefoxProfile = config => {
profile.setPreference('browser.helperApps.alwaysAsk.force', false);
profile.setPreference('browser.download.manager.showWhenStarting', false);
profile.setPreference('browser.download.manager.showAlertOnComplete', false);
- /* eslint-disable max-len */
profile.setPreference(
'browser.helperApps.neverAsk.saveToDisk',
'application/vnd.hzn-3d-crossword;video/3gpp;video/3gpp2;application/vnd.mseq;application/vnd.3m.post-it-notes;application/vnd.3gpp.pic-bw-large;application/vnd.3gpp.pic-bw-small;application/vnd.3gpp.pic-bw-var;application/vnd.3gp2.tcap;application/x-7z-compressed;application/x-abiword;application/x-ace-compressed;application/vnd.americandynamics.acc;application/vnd.acucobol;application/vnd.acucorp;audio/adpcm;application/x-authorware-bin;application/x-athorware-map;application/x-authorware-seg;application/vnd.adobe.air-application-installer-package+zip;application/x-shockwave-flash;application/vnd.adobe.fxp;application/pdf;application/vnd.cups-ppd;application/x-director;applicaion/vnd.adobe.xdp+xml;application/vnd.adobe.xfdf;audio/x-aac;application/vnd.ahead.space;application/vnd.airzip.filesecure.azf;application/vnd.airzip.filesecure.azs;application/vnd.amazon.ebook;application/vnd.amiga.ami;applicatin/andrew-inset;application/vnd.android.package-archive;application/vnd.anser-web-certificate-issue-initiation;application/vnd.anser-web-funds-transfer-initiation;application/vnd.antix.game-component;application/vnd.apple.installe+xml;application/applixware;application/vnd.hhe.lesson-player;application/vnd.aristanetworks.swi;text/x-asm;application/atomcat+xml;application/atomsvc+xml;application/atom+xml;application/pkix-attr-cert;audio/x-aiff;video/x-msvieo;application/vnd.audiograph;image/vnd.dxf;model/vnd.dwf;text/plain-bas;application/x-bcpio;application/octet-stream;image/bmp;application/x-bittorrent;application/vnd.rim.cod;application/vnd.blueice.multipass;application/vnd.bm;application/x-sh;image/prs.btif;application/vnd.businessobjects;application/x-bzip;application/x-bzip2;application/x-csh;text/x-c;application/vnd.chemdraw+xml;text/css;chemical/x-cdx;chemical/x-cml;chemical/x-csml;application/vn.contact.cmsg;application/vnd.claymore;application/vnd.clonk.c4group;image/vnd.dvb.subtitle;application/cdmi-capability;application/cdmi-container;application/cdmi-domain;application/cdmi-object;application/cdmi-queue;applicationvnd.cluetrust.cartomobile-config;application/vnd.cluetrust.cartomobile-config-pkg;image/x-cmu-raster;model/vnd.collada+xml;text/csv;application/mac-compactpro;application/vnd.wap.wmlc;image/cgm;x-conference/x-cooltalk;image/x-cmx;application/vnd.xara;application/vnd.cosmocaller;application/x-cpio;application/vnd.crick.clicker;application/vnd.crick.clicker.keyboard;application/vnd.crick.clicker.palette;application/vnd.crick.clicker.template;application/vn.crick.clicker.wordbank;application/vnd.criticaltools.wbs+xml;application/vnd.rig.cryptonote;chemical/x-cif;chemical/x-cmdf;application/cu-seeme;application/prs.cww;text/vnd.curl;text/vnd.curl.dcurl;text/vnd.curl.mcurl;text/vnd.crl.scurl;application/vnd.curl.car;application/vnd.curl.pcurl;application/vnd.yellowriver-custom-menu;application/dssc+der;application/dssc+xml;application/x-debian-package;audio/vnd.dece.audio;image/vnd.dece.graphic;video/vnd.dec.hd;video/vnd.dece.mobile;video/vnd.uvvu.mp4;video/vnd.dece.pd;video/vnd.dece.sd;video/vnd.dece.video;application/x-dvi;application/vnd.fdsn.seed;application/x-dtbook+xml;application/x-dtbresource+xml;application/vnd.dvb.ait;applcation/vnd.dvb.service;audio/vnd.digital-winds;image/vnd.djvu;application/xml-dtd;application/vnd.dolby.mlp;application/x-doom;application/vnd.dpgraph;audio/vnd.dra;application/vnd.dreamfactory;audio/vnd.dts;audio/vnd.dts.hd;imag/vnd.dwg;application/vnd.dynageo;application/ecmascript;application/vnd.ecowin.chart;image/vnd.fujixerox.edmics-mmr;image/vnd.fujixerox.edmics-rlc;application/exi;application/vnd.proteus.magazine;application/epub+zip;message/rfc82;application/vnd.enliven;application/vnd.is-xpr;image/vnd.xiff;application/vnd.xfdl;application/emma+xml;application/vnd.ezpix-album;application/vnd.ezpix-package;image/vnd.fst;video/vnd.fvt;image/vnd.fastbidsheet;application/vn.denovo.fcselayout-link;video/x-f4v;video/x-flv;image/vnd.fpx;image/vnd.net-fpx;text/vnd.fmi.flexstor;video/x-fli;application/vnd.fluxtime.clip;application/vnd.fdf;text/x-fortran;application/vnd.mif;application/vnd.framemaker;imae/x-freehand;application/vnd.fsc.weblaunch;application/vnd.frogans.fnc;application/vnd.frogans.ltf;application/vnd.fujixerox.ddd;application/vnd.fujixerox.docuworks;application/vnd.fujixerox.docuworks.binder;application/vnd.fujitu.oasys;application/vnd.fujitsu.oasys2;application/vnd.fujitsu.oasys3;application/vnd.fujitsu.oasysgp;application/vnd.fujitsu.oasysprs;application/x-futuresplash;application/vnd.fuzzysheet;image/g3fax;application/vnd.gmx;model/vn.gtw;application/vnd.genomatix.tuxedo;application/vnd.geogebra.file;application/vnd.geogebra.tool;model/vnd.gdl;application/vnd.geometry-explorer;application/vnd.geonext;application/vnd.geoplan;application/vnd.geospace;applicatio/x-font-ghostscript;application/x-font-bdf;application/x-gtar;application/x-texinfo;application/x-gnumeric;application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/vnd.grafeq;image/gif;text/vnd.graphviz;aplication/vnd.groove-account;application/vnd.groove-help;application/vnd.groove-identity-message;application/vnd.groove-injector;application/vnd.groove-tool-message;application/vnd.groove-tool-template;application/vnd.groove-vcar;video/h261;video/h263;video/h264;application/vnd.hp-hpid;application/vnd.hp-hps;application/x-hdf;audio/vnd.rip;application/vnd.hbci;application/vnd.hp-jlyt;application/vnd.hp-pcl;application/vnd.hp-hpgl;application/vnd.yamaha.h-script;application/vnd.yamaha.hv-dic;application/vnd.yamaha.hv-voice;application/vnd.hydrostatix.sof-data;application/hyperstudio;application/vnd.hal+xml;text/html;application/vnd.ibm.rights-management;application/vnd.ibm.securecontainer;text/calendar;application/vnd.iccprofile;image/x-icon;application/vnd.igloader;image/ief;application/vnd.immervision-ivp;application/vnd.immervision-ivu;application/reginfo+xml;text/vnd.in3d.3dml;text/vnd.in3d.spot;mode/iges;application/vnd.intergeo;application/vnd.cinderella;application/vnd.intercon.formnet;application/vnd.isac.fcs;application/ipfix;application/pkix-cert;application/pkixcmp;application/pkix-crl;application/pkix-pkipath;applicaion/vnd.insors.igm;application/vnd.ipunplugged.rcprofile;application/vnd.irepository.package+xml;text/vnd.sun.j2me.app-descriptor;application/java-archive;application/java-vm;application/x-java-jnlp-file;application/java-serializd-object;text/x-java-source,java;application/javascript;application/json;application/vnd.joost.joda-archive;video/jpm;image/jpeg;video/jpeg;application/vnd.kahootz;application/vnd.chipnuts.karaoke-mmd;application/vnd.kde.karbon;aplication/vnd.kde.kchart;application/vnd.kde.kformula;application/vnd.kde.kivio;application/vnd.kde.kontour;application/vnd.kde.kpresenter;application/vnd.kde.kspread;application/vnd.kde.kword;application/vnd.kenameaapp;applicatin/vnd.kidspiration;application/vnd.kinar;application/vnd.kodak-descriptor;application/vnd.las.las+xml;application/x-latex;application/vnd.llamagraphics.life-balance.desktop;application/vnd.llamagraphics.life-balance.exchange+xml;application/vnd.jam;application/vnd.lotus-1-2-3;application/vnd.lotus-approach;application/vnd.lotus-freelance;application/vnd.lotus-notes;application/vnd.lotus-organizer;application/vnd.lotus-screencam;application/vnd.lotus-wordro;audio/vnd.lucent.voice;audio/x-mpegurl;video/x-m4v;application/mac-binhex40;application/vnd.macports.portpkg;application/vnd.osgeo.mapguide.package;application/marc;application/marcxml+xml;application/mxf;application/vnd.wolfrm.player;application/mathematica;application/mathml+xml;application/mbox;application/vnd.medcalcdata;application/mediaservercontrol+xml;application/vnd.mediastation.cdkey;application/vnd.mfer;application/vnd.mfmp;model/mesh;appliation/mads+xml;application/mets+xml;application/mods+xml;application/metalink4+xml;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-word.document.macroenabled.12;application/vnd.ms-word.template.macroenabed.12;application/vnd.mcd;application/vnd.micrografx.flo;application/vnd.micrografx.igx;application/vnd.eszigno3+xml;application/x-msaccess;video/x-ms-asf;application/x-msdownload;application/vnd.ms-artgalry;application/vnd.ms-ca-compressed;application/vnd.ms-ims;application/x-ms-application;application/x-msclip;image/vnd.ms-modi;application/vnd.ms-fontobject;application/vnd.ms-excel;application/vnd.ms-excel.addin.macroenabled.12;application/vnd.ms-excelsheet.binary.macroenabled.12;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-htmlhelp;application/x-mscardfile;application/vnd.ms-lrm;application/x-msmediaview;aplication/x-msmoney;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshw;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.openxmformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/x-msbinder;application/vnd.ms-officetheme;application/onenote;audio/vnd.ms-playready.media.pya;vdeo/vnd.ms-playready.media.pyv;application/vnd.ms-powerpoint;application/vnd.ms-powerpoint.addin.macroenabled.12;application/vnd.ms-powerpoint.slide.macroenabled.12;application/vnd.ms-powerpoint.presentation.macroenabled.12;appliation/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.ms-project;application/x-mspublisher;application/x-msschedule;application/x-silverlight-app;application/vnd.ms-pki.stl;application/vnd.ms-pki.seccat;application/vn.visio;video/x-ms-wm;audio/x-ms-wma;audio/x-ms-wax;video/x-ms-wmx;application/x-ms-wmd;application/vnd.ms-wpl;application/x-ms-wmz;video/x-ms-wmv;video/x-ms-wvx;application/x-msmetafile;application/x-msterminal;application/msword;application/x-mswrite;application/vnd.ms-works;application/x-ms-xbap;application/vnd.ms-xpsdocument;audio/midi;application/vnd.ibm.minipay;application/vnd.ibm.modcap;application/vnd.jcp.javame.midlet-rms;application/vnd.tmobile-ivetv;application/x-mobipocket-ebook;application/vnd.mobius.mbk;application/vnd.mobius.dis;application/vnd.mobius.plc;application/vnd.mobius.mqy;application/vnd.mobius.msl;application/vnd.mobius.txf;application/vnd.mobius.daf;tex/vnd.fly;application/vnd.mophun.certificate;application/vnd.mophun.application;video/mj2;audio/mpeg;video/vnd.mpegurl;video/mpeg;application/mp21;audio/mp4;video/mp4;application/mp4;application/vnd.apple.mpegurl;application/vnd.msician;application/vnd.muvee.style;application/xv+xml;application/vnd.nokia.n-gage.data;application/vnd.nokia.n-gage.symbian.install;application/x-dtbncx+xml;application/x-netcdf;application/vnd.neurolanguage.nlu;application/vnd.na;application/vnd.noblenet-directory;application/vnd.noblenet-sealer;application/vnd.noblenet-web;application/vnd.nokia.radio-preset;application/vnd.nokia.radio-presets;text/n3;application/vnd.novadigm.edm;application/vnd.novadim.edx;application/vnd.novadigm.ext;application/vnd.flographit;audio/vnd.nuera.ecelp4800;audio/vnd.nuera.ecelp7470;audio/vnd.nuera.ecelp9600;application/oda;application/ogg;audio/ogg;video/ogg;application/vnd.oma.dd2+xml;applicatin/vnd.oasis.opendocument.text-web;application/oebps-package+xml;application/vnd.intu.qbo;application/vnd.openofficeorg.extension;application/vnd.yamaha.openscoreformat;audio/webm;video/webm;application/vnd.oasis.opendocument.char;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.database;application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.oasis.opendocument.grapics;application/vnd.oasis.opendocument.graphics-template;application/vnd.oasis.opendocument.image;application/vnd.oasis.opendocument.image-template;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocumen.presentation-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.asis.opendocument.text-template;image/ktx;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.sun.xml.impress;application/vnd.sun.xl.impress.template;application/vnd.sun.xml.math;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/x-font-otf;application/vnd.yamaha.openscoreformat.osfpvg+xml;application/vnd.osgi.dp;application/vnd.palm;text/x-pascal;application/vnd.pawaafile;application/vnd.hp-pclxl;application/vnd.picsel;image/x-pcx;image/vnd.adobe.photoshop;application/pics-rules;image/x-pict;application/x-chat;aplication/pkcs10;application/x-pkcs12;application/pkcs7-mime;application/pkcs7-signature;application/x-pkcs7-certreqresp;application/x-pkcs7-certificates;application/pkcs8;application/vnd.pocketlearn;image/x-portable-anymap;image/-portable-bitmap;application/x-font-pcf;application/font-tdpfr;application/x-chess-pgn;image/x-portable-graymap;image/png;image/x-portable-pixmap;application/pskc+xml;application/vnd.ctc-posml;application/postscript;application/xfont-type1;application/vnd.powerbuilder6;application/pgp-encrypted;application/pgp-signature;application/vnd.previewsystems.box;application/vnd.pvi.ptid1;application/pls+xml;application/vnd.pg.format;application/vnd.pg.osasli;tex/prs.lines.tag;application/x-font-linux-psf;application/vnd.publishare-delta-tree;application/vnd.pmi.widget;application/vnd.quark.quarkxpress;application/vnd.epson.esf;application/vnd.epson.msf;application/vnd.epson.ssf;applicaton/vnd.epson.quickanime;application/vnd.intu.qfx;video/quicktime;application/x-rar-compressed;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/rsd+xml;application/vnd.rn-realmedia;application/vnd.realvnc.bed;applicatin/vnd.recordare.musicxml;application/vnd.recordare.musicxml+xml;application/relax-ng-compact-syntax;application/vnd.data-vision.rdz;application/rdf+xml;application/vnd.cloanto.rp9;application/vnd.jisp;application/rtf;text/richtex;application/vnd.route66.link66+xml;application/rss+xml;application/shf+xml;application/vnd.sailingtracker.track;image/svg+xml;application/vnd.sus-calendar;application/sru+xml;application/set-payment-initiation;application/set-reistration-initiation;application/vnd.sema;application/vnd.semd;application/vnd.semf;application/vnd.seemail;application/x-font-snf;application/scvp-vp-request;application/scvp-vp-response;application/scvp-cv-request;application/svp-cv-response;application/sdp;text/x-setext;video/x-sgi-movie;application/vnd.shana.informed.formdata;application/vnd.shana.informed.formtemplate;application/vnd.shana.informed.interchange;application/vnd.shana.informed.package;application/thraud+xml;application/x-shar;image/x-rgb;application/vnd.epson.salt;application/vnd.accpac.simply.aso;application/vnd.accpac.simply.imp;application/vnd.simtech-mindmapper;application/vnd.commonspace;application/vnd.ymaha.smaf-audio;application/vnd.smaf;application/vnd.yamaha.smaf-phrase;application/vnd.smart.teacher;application/vnd.svd;application/sparql-query;application/sparql-results+xml;application/srgs;application/srgs+xml;application/sml+xml;application/vnd.koan;text/sgml;application/vnd.stardivision.calc;application/vnd.stardivision.draw;application/vnd.stardivision.impress;application/vnd.stardivision.math;application/vnd.stardivision.writer;application/vnd.tardivision.writer-global;application/vnd.stepmania.stepchart;application/x-stuffit;application/x-stuffitx;application/vnd.solent.sdkm+xml;application/vnd.olpc-sugar;audio/basic;application/vnd.wqd;application/vnd.symbian.install;application/smil+xml;application/vnd.syncml+xml;application/vnd.syncml.dm+wbxml;application/vnd.syncml.dm+xml;application/x-sv4cpio;application/x-sv4crc;application/sbml+xml;text/tab-separated-values;image/tiff;application/vnd.to.intent-module-archive;application/x-tar;application/x-tcl;application/x-tex;application/x-tex-tfm;application/tei+xml;text/plain;application/vnd.spotfire.dxp;application/vnd.spotfire.sfs;application/timestamped-data;applicationvnd.trid.tpt;application/vnd.triscape.mxs;text/troff;application/vnd.trueapp;application/x-font-ttf;text/turtle;application/vnd.umajin;application/vnd.uoml+xml;application/vnd.unity;application/vnd.ufdl;text/uri-list;application/nd.uiq.theme;application/x-ustar;text/x-uuencode;text/x-vcalendar;text/x-vcard;application/x-cdlink;application/vnd.vsf;model/vrml;application/vnd.vcx;model/vnd.mts;model/vnd.vtu;application/vnd.visionary;video/vnd.vivo;applicatin/ccxml+xml,;application/voicexml+xml;application/x-wais-source;application/vnd.wap.wbxml;image/vnd.wap.wbmp;audio/x-wav;application/davmount+xml;application/x-font-woff;application/wspolicy+xml;image/webp;application/vnd.webturb;application/widget;application/winhlp;text/vnd.wap.wml;text/vnd.wap.wmlscript;application/vnd.wap.wmlscriptc;application/vnd.wordperfect;application/vnd.wt.stf;application/wsdl+xml;image/x-xbitmap;image/x-xpixmap;image/x-xwindowump;application/x-x509-ca-cert;application/x-xfig;application/xhtml+xml;application/xml;application/xcap-diff+xml;application/xenc+xml;application/patch-ops-error+xml;application/resource-lists+xml;application/rls-services+xml;aplication/resource-lists-diff+xml;application/xslt+xml;application/xop+xml;application/x-xpinstall;application/xspf+xml;application/vnd.mozilla.xul+xml;chemical/x-xyz;text/yaml;application/yang;application/yin+xml;application/vnd.ul;application/zip;application/vnd.handheld-entertainment+xml;application/vnd.zzazz.deck+xml'
);
- /* eslint-enable max-len */
profile.setPreference('pdfjs.disabled', true);
return profile;
diff --git a/src/web/browsers/get-browser-drivers.helper.ts b/src/web/browsers/get-browser-drivers.helper.ts
new file mode 100644
index 00000000..b91f70a5
--- /dev/null
+++ b/src/web/browsers/get-browser-drivers.helper.ts
@@ -0,0 +1,16 @@
+import * as fs from 'fs';
+
+export const getBrowsersDrivers = (commandArgs): string[] => {
+ const drivers: string[] = [];
+ const pathToDrivers = './node_modules/protractor/node_modules/webdriver-manager/selenium';
+
+ if (commandArgs.ie) {
+ // This is required as Protractor cannot find IEDriverServer. The other drivers does not require any additional configuration.
+ const availableDrivers = fs.readdirSync(pathToDrivers);
+ const IEDriver = availableDrivers.filter(item => item.match('IEDriverServer([0-9].[0-9]{3}.[0-9]).exe'))[0];
+
+ drivers.push(`-Dwebdriver.ie.driver=${pathToDrivers}/${IEDriver}`);
+ }
+
+ return drivers;
+};
diff --git a/src/web/browsers/safari-browser-configurator.helper.js b/src/web/browsers/safari-browser-configurator.helper.ts
similarity index 72%
rename from src/web/browsers/safari-browser-configurator.helper.js
rename to src/web/browsers/safari-browser-configurator.helper.ts
index 1169df29..30655ae0 100644
--- a/src/web/browsers/safari-browser-configurator.helper.js
+++ b/src/web/browsers/safari-browser-configurator.helper.ts
@@ -1,5 +1,5 @@
-import shell from 'shelljs';
-import path from 'path';
+import * as path from 'path';
+import * as shell from 'shelljs';
export const safariBrowserConfigurator = config => {
shell.exec(`defaults write -app Safari DownloadsPath ${path.join(config.projectPath, config.downloads)}`);
diff --git a/src/web/cucumber/config.js b/src/web/cucumber/config.js
deleted file mode 100644
index 58d41f75..00000000
--- a/src/web/cucumber/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import config from '../../core/config.helper';
-const { defineSupportCode } = require('cucumber');
-
-defineSupportCode(function({ setDefaultTimeout }) {
- setDefaultTimeout(Number(config.timeout) * 1000);
-});
diff --git a/src/web/cucumber/config.ts b/src/web/cucumber/config.ts
new file mode 100644
index 00000000..1b840481
--- /dev/null
+++ b/src/web/cucumber/config.ts
@@ -0,0 +1,4 @@
+import config from '../../core/config.helper';
+import { setDefaultTimeout } from 'cucumber';
+
+setDefaultTimeout(Number(config.timeout) * 1000);
diff --git a/src/web/cucumber/hooks.js b/src/web/cucumber/hooks.js
deleted file mode 100644
index cc804c2c..00000000
--- a/src/web/cucumber/hooks.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import config from '../../core/config.helper';
-import fs from 'fs';
-import path from 'path';
-import userProvider from '../user-provider.helper';
-import fixturesLoader from '../fixtures/fixtures-loader.helper';
-import parameters from '../parameters';
-import chalk from 'chalk';
-import { defineSupportCode } from 'cucumber';
-import variableStore from '../variable-store.helper';
-
-const logRequestTime = timeStart => {
- const timeDiff = process.hrtime(timeStart);
-
- console.log(chalk.black.bgYellow('Request took ' + (timeDiff[0] + timeDiff[1] / 1000000000) + ' seconds'));
-};
-
-const takeScreenshot = scenario => {
- return browser.takeScreenshot().then(
- function(base64png) {
- scenario.attach(new Buffer(base64png, 'base64'), 'image/png');
- return Promise.resolve();
- },
- function() {
- return Promise.resolve();
- }
- );
-};
-
-const clearCookiesAndLocalStorage = callback => {
- let cookiesFunc = () => Promise.resolve(true);
-
- if (config.clearCookiesAfterScenario) {
- cookiesFunc = () => protractor.browser.manage().deleteAllCookies();
- }
-
- let localStorageFunc = () => Promise.resolve(true);
- if (config.clearLocalStorageAfterScenario) {
- localStorageFunc = () => protractor.browser.executeScript('window.localStorage.clear();');
- }
-
- browser
- .wait(
- cookiesFunc()
- .then(localStorageFunc)
- .catch(() => false),
- config.waitForPageTimeout * 1000
- )
- .then(() => {
- protractor.browser.ignoreSynchronization = config.type === 'otherWeb';
- callback();
- });
-};
-
-const clearDownload = callback => {
- const files = fs.readdirSync(path.join(config.projectPath, config.downloads)).filter(function(file) {
- return file !== '.gitkeep';
- });
-
- for (let index = 0; index < files.length; index++) {
- fs.unlinkSync(path.join(config.projectPath, config.downloads, files[index]));
- }
-
- callback();
-};
-
-defineSupportCode(({ After, Before }) => {
- After(function(scenario, callback) {
- if (scenario.result.status !== 'passed') {
- takeScreenshot(this).then(() => {
- clearCookiesAndLocalStorage(callback);
- });
- } else {
- clearCookiesAndLocalStorage(callback);
- }
- });
-
- Before(function(scenario, callback) {
- this.currentUser = null;
-
- if (typeof this.userProvider === 'undefined') {
- this.userProvider = userProvider;
- }
-
- variableStore.clearVariables();
-
- callback();
- });
-
- Before('@downloadClearBefore', function(scenario, callback) {
- clearDownload(callback);
- });
-
- After('@downloadClearAfter', function(scenario, callback) {
- clearDownload(callback);
- });
-
- Before('@reloadFixtures', function(scenario, callback) {
- console.log(chalk.black.bgYellow('Reloading fixtures'));
-
- const timeStart = process.hrtime();
-
- fixturesLoader
- .reloadFixtures(parameters.getReloadFixturesEndpoint())
- .then(function(response) {
- if (response.status === 200) {
- console.log(chalk.black.bgGreen('Fixtures reloaded'));
- } else {
- console.log(chalk.black.bgRed('There was a problem with fixtures reloading. The response is: '), response);
- }
-
- logRequestTime(timeStart);
-
- callback();
- })
- .catch(function(error) {
- console.log(chalk.black.bgRed('An error occurred during fixtures reloading: '), error);
-
- logRequestTime(timeStart);
-
- callback();
- });
- });
-
- After('@reloadUsers', function(scenario, callback) {
- if (this.currentUser !== null) {
- this.userProvider.lockUser(this.currentUser.account, this.currentUser.type);
- }
-
- callback();
- });
-
- protractor.browser.ignoreSynchronization = config.type === 'otherWeb';
-});
diff --git a/src/web/cucumber/hooks.ts b/src/web/cucumber/hooks.ts
new file mode 100644
index 00000000..b202acc4
--- /dev/null
+++ b/src/web/cucumber/hooks.ts
@@ -0,0 +1,3 @@
+import { hookHandlers } from './hooks/hooks';
+
+hookHandlers.initializeHook();
diff --git a/src/web/cucumber/hooks/clear-download.hook.ts b/src/web/cucumber/hooks/clear-download.hook.ts
new file mode 100644
index 00000000..627a9cce
--- /dev/null
+++ b/src/web/cucumber/hooks/clear-download.hook.ts
@@ -0,0 +1,33 @@
+import { After, Before } from 'cucumber';
+import { HookHandler } from './hook.interface';
+import * as fs from 'fs';
+import * as path from 'path';
+import config from '../../../core/config.helper';
+
+const clearDownload = callback => {
+ const files = fs.readdirSync(path.join(config.projectPath, config.downloads)).filter(file => file !== '.gitkeep');
+
+ for (const file of files) {
+ fs.unlinkSync(path.join(config.projectPath, config.downloads, file));
+ }
+
+ callback();
+};
+
+class ClearDownloadHook implements HookHandler {
+ public initializeHook() {
+ Before('@downloadClearBefore', (scenario, callback) => {
+ clearDownload(callback);
+ });
+
+ After('@downloadClearAfter', (scenario, callback) => {
+ clearDownload(callback);
+ });
+ }
+
+ public getPriority() {
+ return 1;
+ }
+}
+
+export const clearDownloadHook = new ClearDownloadHook();
diff --git a/src/web/cucumber/hooks/clear-variables.hook.ts b/src/web/cucumber/hooks/clear-variables.hook.ts
new file mode 100644
index 00000000..514fe380
--- /dev/null
+++ b/src/web/cucumber/hooks/clear-variables.hook.ts
@@ -0,0 +1,26 @@
+import { Before } from 'cucumber';
+import { HookHandler } from './hook.interface';
+import userProvider from '../../user-provider.helper';
+import variableStore from '../../variable-store.helper';
+
+class ClearVariablesHook implements HookHandler {
+ public initializeHook() {
+ Before(function(scenario, callback) {
+ this.currentUser = null;
+
+ if (typeof this.userProvider === 'undefined') {
+ this.userProvider = userProvider;
+ }
+
+ variableStore.clearVariables();
+
+ callback();
+ });
+ }
+
+ public getPriority() {
+ return 1;
+ }
+}
+
+export const clearVariablesHook = new ClearVariablesHook();
diff --git a/src/web/cucumber/hooks/hook.interface.ts b/src/web/cucumber/hooks/hook.interface.ts
new file mode 100644
index 00000000..3cf47e8b
--- /dev/null
+++ b/src/web/cucumber/hooks/hook.interface.ts
@@ -0,0 +1,4 @@
+export interface HookHandler {
+ initializeHook(): void;
+ getPriority(): number;
+}
diff --git a/src/web/cucumber/hooks/hooks.ts b/src/web/cucumber/hooks/hooks.ts
new file mode 100644
index 00000000..6b15e94f
--- /dev/null
+++ b/src/web/cucumber/hooks/hooks.ts
@@ -0,0 +1,32 @@
+import * as hookHandler from './index';
+import { HookHandler } from './hook.interface';
+
+class HookHandlers {
+ constructor(
+ private availableHandlers: HookHandler[] = [
+ hookHandler.takeScreenshotHook,
+ hookHandler.reloadFixturesHook,
+ hookHandler.clearDownloadHook,
+ hookHandler.reloadUserHook,
+ hookHandler.clearVariablesHook,
+ ]
+ ) {}
+
+ public addHook(handler: HookHandler): void {
+ this.availableHandlers.push(handler);
+ }
+
+ public initializeHook(): void {
+ const handlers = this.getHooks();
+
+ for (const handler of handlers) {
+ handler.initializeHook();
+ }
+ }
+
+ public getHooks(): HookHandler[] {
+ return this.availableHandlers.sort((handler, otherHandler) => handler.getPriority() - otherHandler.getPriority());
+ }
+}
+
+export const hookHandlers = new HookHandlers();
diff --git a/src/web/cucumber/hooks/index.ts b/src/web/cucumber/hooks/index.ts
new file mode 100644
index 00000000..f3468ac9
--- /dev/null
+++ b/src/web/cucumber/hooks/index.ts
@@ -0,0 +1,5 @@
+export * from './take-screenshots.hook';
+export * from './reload-fixtures.hook';
+export * from './reload-user.hook';
+export * from './clear-download.hook';
+export * from './clear-variables.hook';
diff --git a/src/web/cucumber/hooks/reload-fixtures.hook.ts b/src/web/cucumber/hooks/reload-fixtures.hook.ts
new file mode 100644
index 00000000..474966d3
--- /dev/null
+++ b/src/web/cucumber/hooks/reload-fixtures.hook.ts
@@ -0,0 +1,48 @@
+import { Before } from 'cucumber';
+import { HookHandler } from './hook.interface';
+import chalk from 'chalk';
+import parameters from '../../parameters';
+import fixturesLoader from '../../fixtures/fixtures-loader.helper';
+
+const logRequestTime = timeStart => {
+ const timeDiff = process.hrtime(timeStart);
+
+ console.log(chalk.black.bgYellow('Request took ' + (timeDiff[0] + timeDiff[1] / 1000000000) + ' seconds'));
+};
+
+class ReloadFixturesHook implements HookHandler {
+ public initializeHook() {
+ Before('@reloadFixtures', (scenario, callback) => {
+ console.log(chalk.black.bgYellow('Reloading fixtures'));
+
+ const timeStart = process.hrtime();
+
+ fixturesLoader
+ .reloadFixtures(parameters.getReloadFixturesEndpoint())
+ .then(response => {
+ if (response.status === 200) {
+ console.log(chalk.black.bgGreen('Fixtures reloaded'));
+ } else {
+ console.log(chalk.black.bgRed('There was a problem with fixtures reloading. The response is: '), response);
+ }
+
+ logRequestTime(timeStart);
+
+ callback();
+ })
+ .catch(error => {
+ console.log(chalk.black.bgRed('An error occurred during fixtures reloading: '), error);
+
+ logRequestTime(timeStart);
+
+ callback();
+ });
+ });
+ }
+
+ public getPriority() {
+ return 2;
+ }
+}
+
+export const reloadFixturesHook = new ReloadFixturesHook();
diff --git a/src/web/cucumber/hooks/reload-user.hook.ts b/src/web/cucumber/hooks/reload-user.hook.ts
new file mode 100644
index 00000000..e0cb6db9
--- /dev/null
+++ b/src/web/cucumber/hooks/reload-user.hook.ts
@@ -0,0 +1,20 @@
+import { After } from 'cucumber';
+import { HookHandler } from './hook.interface';
+
+class ReloadUserHook implements HookHandler {
+ public initializeHook() {
+ After('@reloadUsers', function(scenario, callback) {
+ if (this.currentUser !== null) {
+ this.userProvider.lockUser(this.currentUser.account, this.currentUser.type);
+ }
+
+ callback();
+ });
+ }
+
+ public getPriority() {
+ return 1;
+ }
+}
+
+export const reloadUserHook = new ReloadUserHook();
diff --git a/src/web/cucumber/hooks/take-screenshots.hook.ts b/src/web/cucumber/hooks/take-screenshots.hook.ts
new file mode 100644
index 00000000..0839dc6b
--- /dev/null
+++ b/src/web/cucumber/hooks/take-screenshots.hook.ts
@@ -0,0 +1,58 @@
+import { HookHandler } from './hook.interface';
+import config from '../../../core/config.helper';
+import { After } from 'cucumber';
+
+const takeScreenshot = scenario => {
+ return browser.takeScreenshot().then(
+ base64png => {
+ scenario.attach(new Buffer(base64png, 'base64'), 'image/png');
+ return Promise.resolve();
+ },
+ () => Promise.resolve()
+ );
+};
+
+const clearCookiesAndLocalStorage = callback => {
+ let cookiesFunc = () => Promise.resolve(true);
+
+ if (config.clearCookiesAfterScenario) {
+ cookiesFunc = () => protractor.browser.manage().deleteAllCookies();
+ }
+
+ let localStorageFunc = () => Promise.resolve(true);
+ if (config.clearLocalStorageAfterScenario) {
+ localStorageFunc = () => protractor.browser.executeScript('window.localStorage.clear();');
+ }
+
+ browser
+ .wait(
+ cookiesFunc()
+ .then(localStorageFunc)
+ .catch(() => false),
+ config.waitForPageTimeout * 1000
+ )
+ .then(() => {
+ protractor.browser.ignoreSynchronization = config.type === 'otherWeb';
+ callback();
+ });
+};
+
+class TakeScreenshotHook implements HookHandler {
+ public initializeHook() {
+ return After(function(scenario, callback) {
+ if (scenario.result.status !== 'passed') {
+ takeScreenshot(this).then(() => {
+ clearCookiesAndLocalStorage(callback);
+ });
+ } else {
+ clearCookiesAndLocalStorage(callback);
+ }
+ });
+ }
+
+ public getPriority() {
+ return 1;
+ }
+}
+
+export const takeScreenshotHook = new TakeScreenshotHook();
diff --git a/src/web/cucumber/wait-for-condition.helper.js b/src/web/cucumber/wait-for-condition.helper.ts
similarity index 100%
rename from src/web/cucumber/wait-for-condition.helper.js
rename to src/web/cucumber/wait-for-condition.helper.ts
diff --git a/src/web/fixtures/fixtures-loader.helper.js b/src/web/fixtures/fixtures-loader.helper.ts
similarity index 76%
rename from src/web/fixtures/fixtures-loader.helper.js
rename to src/web/fixtures/fixtures-loader.helper.ts
index f001ff46..1a5d570a 100644
--- a/src/web/fixtures/fixtures-loader.helper.js
+++ b/src/web/fixtures/fixtures-loader.helper.ts
@@ -1,7 +1,7 @@
import fetch from 'node-fetch';
const FixturesLoader = {
- reloadFixtures: function(endpoint) {
+ reloadFixtures(endpoint) {
return fetch(endpoint);
},
};
diff --git a/src/web/fs/download-checker.helper.js b/src/web/fs/download-checker.helper.ts
similarity index 64%
rename from src/web/fs/download-checker.helper.js
rename to src/web/fs/download-checker.helper.ts
index 8f11f7a3..33aa8e14 100644
--- a/src/web/fs/download-checker.helper.js
+++ b/src/web/fs/download-checker.helper.ts
@@ -1,10 +1,10 @@
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
import config from '../../core/config.helper';
const DownloadChecker = {
- wasDownloaded: function(expectedFileName) {
- return browser.driver.wait(function() {
+ wasDownloaded(expectedFileName) {
+ return browser.driver.wait(() => {
return fs.existsSync(path.join(config.projectPath, config.downloads, expectedFileName));
}, config.downloadTimeout * 1000);
},
diff --git a/src/web/fs/file-manager.helper.js b/src/web/fs/file-manager.helper.ts
similarity index 62%
rename from src/web/fs/file-manager.helper.js
rename to src/web/fs/file-manager.helper.ts
index 24b5a802..d0d1ea15 100644
--- a/src/web/fs/file-manager.helper.js
+++ b/src/web/fs/file-manager.helper.ts
@@ -1,16 +1,16 @@
-import fs from 'fs';
-import path from 'path';
-import xlsx from 'node-xlsx';
+import * as fs from 'fs';
+import * as xlsx from 'node-xlsx';
+import * as path from 'path';
import config from '../../core/config.helper';
const FileManager = {
- wasDownloaded: function(expectedFileName) {
- return browser.driver.wait(function() {
+ wasDownloaded(expectedFileName) {
+ return browser.driver.wait(() => {
return fs.existsSync(path.join(config.projectPath, config.downloads, expectedFileName));
}, config.downloadTimeout * 1000);
},
- parseXLS: function(expectedFileName) {
+ parseXLS(expectedFileName) {
return xlsx.parse(path.join(config.projectPath, config.downloads, expectedFileName))[0].data;
},
};
diff --git a/src/web/parallel/chunk-specs.helper.spec.js b/src/web/parallel/chunk-specs.helper.spec.ts
similarity index 100%
rename from src/web/parallel/chunk-specs.helper.spec.js
rename to src/web/parallel/chunk-specs.helper.spec.ts
diff --git a/src/web/parallel/chunk-specs.helper.js b/src/web/parallel/chunk-specs.helper.ts
similarity index 95%
rename from src/web/parallel/chunk-specs.helper.js
rename to src/web/parallel/chunk-specs.helper.ts
index 68f4406c..840b0ba8 100644
--- a/src/web/parallel/chunk-specs.helper.js
+++ b/src/web/parallel/chunk-specs.helper.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import * as _ from 'lodash';
export const chunkSpecs = (commandArgs, allSpecs, expectedArrayLength, numberOfInstances) => {
if (commandArgs.pattern !== undefined && typeof commandArgs.pattern !== 'boolean') {
diff --git a/src/web/parallel/prepare-browser-instance-specs.helper.js b/src/web/parallel/prepare-browser-instance-specs.helper.ts
similarity index 84%
rename from src/web/parallel/prepare-browser-instance-specs.helper.js
rename to src/web/parallel/prepare-browser-instance-specs.helper.ts
index 219f8bfa..d1af2e0e 100644
--- a/src/web/parallel/prepare-browser-instance-specs.helper.js
+++ b/src/web/parallel/prepare-browser-instance-specs.helper.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import * as _ from 'lodash';
export const prepareBrowserInstance = (browserConfig, specs) => {
const instance = _.cloneDeep(browserConfig);
diff --git a/src/web/parameters.js b/src/web/parameters.ts
similarity index 90%
rename from src/web/parameters.js
rename to src/web/parameters.ts
index e3d45dc3..a075d118 100644
--- a/src/web/parameters.js
+++ b/src/web/parameters.ts
@@ -1,5 +1,5 @@
const Parameters = {
- getReloadFixturesEndpoint: function() {
+ getReloadFixturesEndpoint() {
const config = this.getConfig();
return config.fixturesReloadHost;
diff --git a/src/web/performance/JSON-performance-report-parser.helper.spec.js b/src/web/performance/JSON-performance-report-parser.helper.spec.ts
similarity index 55%
rename from src/web/performance/JSON-performance-report-parser.helper.spec.js
rename to src/web/performance/JSON-performance-report-parser.helper.spec.ts
index 68ce37d6..6b54148f 100644
--- a/src/web/performance/JSON-performance-report-parser.helper.spec.js
+++ b/src/web/performance/JSON-performance-report-parser.helper.spec.ts
@@ -3,11 +3,11 @@ import JSONPerformanceReportParser from './JSON-performance-report-parser.helper
const parser = new JSONPerformanceReportParser('src/tests/reports/performance');
describe('JSON performance report parser', () => {
- it('returns found objects with TTFB and URL values', (fileName = 'performance-report.har') => {
- expect(parser.parse(fileName, fileName)).toContainEqual({ ttfb: 0, url: 'http://localhost:8080/' });
+ it('returns found objects with TTFB and URL values', (fileName: any = 'performance-report.har') => {
+ expect(parser.parse(fileName)).toContainEqual({ ttfb: 0, url: 'http://localhost:8080/' });
});
- it('returns error message - file contains incorrect data', (fileName = 'incorrect-performance-report.har') => {
- expect(() => parser.parse(fileName, fileName)).toThrow(`${fileName} contains incorrect data!`);
+ it('returns error message - file contains incorrect data', (fileName: any = 'incorrect-performance-report.har') => {
+ expect(() => parser.parse(fileName)).toThrow(`${fileName} contains incorrect data!`);
});
});
diff --git a/src/web/performance/JSON-performance-report-parser.helper.js b/src/web/performance/JSON-performance-report-parser.helper.ts
similarity index 86%
rename from src/web/performance/JSON-performance-report-parser.helper.js
rename to src/web/performance/JSON-performance-report-parser.helper.ts
index 526f0f02..364b13aa 100644
--- a/src/web/performance/JSON-performance-report-parser.helper.js
+++ b/src/web/performance/JSON-performance-report-parser.helper.ts
@@ -1,15 +1,17 @@
-import fs from 'fs';
+import * as fs from 'fs';
const getReport = (fileName, path) => {
return JSON.parse(fs.readFileSync(`${path}/${fileName}`, 'utf8'));
};
class JSONPerformanceReportParser {
+ private readonly path: string;
+
constructor(path = 'reports/performance') {
this.path = path;
}
- parse(fileName) {
+ public parse(fileName) {
const reportFile = getReport(fileName, this.path);
const requests = reportFile.log.entries.map(item => ({
ttfb: item.timings.wait,
diff --git a/src/web/performance/time-to-first-byte-analyser.helper.spec.js b/src/web/performance/time-to-first-byte-analyser.helper.spec.ts
similarity index 97%
rename from src/web/performance/time-to-first-byte-analyser.helper.spec.js
rename to src/web/performance/time-to-first-byte-analyser.helper.spec.ts
index 1706c7b2..97310e20 100644
--- a/src/web/performance/time-to-first-byte-analyser.helper.spec.js
+++ b/src/web/performance/time-to-first-byte-analyser.helper.spec.ts
@@ -1,6 +1,6 @@
import { create as createAnalyser } from './time-to-first-byte-analyser.helper';
-const myFakeParser = {
+const myFakeParser: any = {
parse: () => {
return [
{ ttfb: 0, url: 'http://localhost:8080/' },
diff --git a/src/web/performance/time-to-first-byte-analyser.helper.js b/src/web/performance/time-to-first-byte-analyser.helper.ts
similarity index 87%
rename from src/web/performance/time-to-first-byte-analyser.helper.js
rename to src/web/performance/time-to-first-byte-analyser.helper.ts
index 890c5e4c..f63525d0 100644
--- a/src/web/performance/time-to-first-byte-analyser.helper.js
+++ b/src/web/performance/time-to-first-byte-analyser.helper.ts
@@ -1,11 +1,13 @@
import JSONPerformanceReportParser from './JSON-performance-report-parser.helper';
class TimeToFirstByteAnalyser {
+ private reader: any;
+
constructor(jsonPerformanceReportParser) {
this.reader = jsonPerformanceReportParser;
}
- checkTiming(fileName, maxTiming) {
+ public checkTiming(fileName, maxTiming) {
const parsedReport = this.reader.parse(fileName);
return parsedReport.filter(report => report.ttfb > maxTiming);
diff --git a/src/web/url-parser.helper.spec.js b/src/web/url-parser.helper.spec.ts
similarity index 100%
rename from src/web/url-parser.helper.spec.js
rename to src/web/url-parser.helper.spec.ts
diff --git a/src/web/url-parser.helper.js b/src/web/url-parser.helper.ts
similarity index 74%
rename from src/web/url-parser.helper.js
rename to src/web/url-parser.helper.ts
index fac1e194..df756995 100644
--- a/src/web/url-parser.helper.js
+++ b/src/web/url-parser.helper.ts
@@ -1,4 +1,4 @@
-import Url from 'url';
+import * as Url from 'url';
const extractDomain = url => Url.parse(url).host;
const extractUrl = url => Url.parse(url).pathname;
@@ -17,14 +17,16 @@ const normalizeUrl = url => {
const compareUrls = (urlSplit, baseUrlSplit) => {
const resultParameters = {};
- for (let i in urlSplit) {
- const template = baseUrlSplit[i];
- const actual = urlSplit[i];
+ for (const i in urlSplit) {
+ if (urlSplit.hasOwnProperty(i) && baseUrlSplit.hasOwnProperty(i)) {
+ const template = baseUrlSplit[i];
+ const actual = urlSplit[i];
- if (template.startsWith(':')) {
- resultParameters[template.substr(1)] = actual;
- } else if (template !== actual) {
- return false;
+ if (template.startsWith(':')) {
+ resultParameters[template.substr(1)] = actual;
+ } else if (template !== actual) {
+ return false;
+ }
}
}
diff --git a/src/web/user-provider.helper.js b/src/web/user-provider.helper.ts
similarity index 91%
rename from src/web/user-provider.helper.js
rename to src/web/user-provider.helper.ts
index 8f5d3b24..41fc1219 100644
--- a/src/web/user-provider.helper.js
+++ b/src/web/user-provider.helper.ts
@@ -2,7 +2,7 @@ import config from '../core/config.helper';
const accounts = config.accounts;
const userProvider = {
- getUser: function(userType) {
+ getUser(userType) {
const user = accounts[userType];
if (user.accounts.length > 1) {
@@ -21,7 +21,7 @@ const userProvider = {
return user.accounts[0];
},
- lockUser: function(user, userType) {
+ lockUser(user, userType) {
if (accounts[userType].accounts.length > 1) {
accounts[userType].accounts.forEach((account, index) => {
if (account.email === user.email) {
diff --git a/src/web/variable-store.helper.spec.js b/src/web/variable-store.helper.spec.ts
similarity index 100%
rename from src/web/variable-store.helper.spec.js
rename to src/web/variable-store.helper.spec.ts
diff --git a/src/web/variable-store.helper.js b/src/web/variable-store.helper.ts
similarity index 55%
rename from src/web/variable-store.helper.js
rename to src/web/variable-store.helper.ts
index 083325f9..e90dd76e 100644
--- a/src/web/variable-store.helper.js
+++ b/src/web/variable-store.helper.ts
@@ -1,29 +1,27 @@
-class VariableStore {
- constructor() {
- this.variables = [];
- }
+export class VariableStore {
+ constructor(public variables: any[] = []) {}
- storeVariable(name, value) {
+ public storeVariable(name: string, value: any): void {
const foundVariable = this.variables.find(variable => variable.name === name);
if (typeof foundVariable !== 'undefined') {
throw new Error(`Variable ${name} is stored already`);
}
- this.variables.push({ name: name, value: value });
+ this.variables.push({ name, value });
}
- updateVariable(name, value) {
+ public updateVariable(name: string, value: any): void {
const foundVariable = this.variables.find(variable => variable.name === name);
if (typeof foundVariable === 'undefined') {
throw new Error(`Variable ${name} does not exist.`);
}
- this.variables.push({ name: name, value: value });
+ this.variables.push({ name, value });
}
- getVariableValue(name) {
+ public getVariableValue(name: string): any {
const foundVariable = this.variables.find(variable => variable.name === name);
if (typeof foundVariable === 'undefined') {
@@ -33,26 +31,28 @@ class VariableStore {
return foundVariable.value;
}
- isStored(name) {
+ public isStored(name: string): boolean {
const foundVariable = this.variables.find(variable => variable.name === name);
return typeof foundVariable !== 'undefined';
}
- clearVariables() {
+ public clearVariables(): void {
this.variables = [];
}
- replaceTextVariables(text) {
+ public replaceTextVariables(text: string): any {
let newText = text;
const variableNames = this.variables.map(variable => variable.name);
- for (let variableNameIndex in variableNames) {
- const variableName = variableNames[variableNameIndex];
+ for (const variableNameIndex in variableNames) {
+ if (variableNames.hasOwnProperty(variableNameIndex)) {
+ const variableName = variableNames[variableNameIndex];
- if (newText.indexOf(variableName) > -1) {
- newText = text.replace(`v:${variableName}`, this.getVariableValue(variableName));
- break;
+ if (newText.indexOf(variableName) > -1) {
+ newText = text.replace(`v:${variableName}`, this.getVariableValue(variableName));
+ break;
+ }
}
}
diff --git a/templates/example.feature b/templates/example.feature
index 6c400206..cd957c6a 100644
--- a/templates/example.feature
+++ b/templates/example.feature
@@ -1,5 +1,5 @@
-Feature:
- Scenario:
+Feature: Example feature file
+ Scenario: Example scenario
When I visit the "page" page
And I generate random "name" as "myName"
Then my matcher "e:name" matches "v:myName"
diff --git a/templates/hook.js b/templates/hook.js
index 643ffb89..3dcf86ea 100644
--- a/templates/hook.js
+++ b/templates/hook.js
@@ -1,7 +1,15 @@
-const { defineSupportCode } = require('kakunin');
+const { hookHandlers, Before } = require('kakunin');
-defineSupportCode(({ Before }) => {
- Before(function () {
- console.log('If you can see this in console then hook is working properly.');
- });
-});
+class TestHook {
+ initializeHook() {
+ Before(() => {
+ console.log('Standard hook');
+ });
+ }
+
+ getPriority() {
+ return 990;
+ }
+}
+
+hookHandlers.addHook(new TestHook());
diff --git a/templates/login.js b/templates/login.js
index aca4254e..3d9b3348 100644
--- a/templates/login.js
+++ b/templates/login.js
@@ -1,27 +1,19 @@
-const { defineSupportCode } = require('kakunin');
+const { Given } = require('kakunin');
-defineSupportCode(({ Given }) => {
- Given(/^I am logged in as a "([^"]*)$/, function (user) {
- this.currentUser = {
- account: this.userProvider.getUser(user),
- type: user
- };
+Given(/^I am logged in as a "([^"]*)$/, async function(user) {
+ this.currentUser = {
+ account: this.userProvider.getUser(user),
+ type: user,
+ };
- const mainPage = browser.page.main;
- const loginPage = browser.page.login;
- const self = this;
+ const mainPage = browser.page.main;
+ const loginPage = browser.page.login;
- return mainPage.visit().then(function () {
- return mainPage.isVisible('login');
- }).then(function () {
- return mainPage.click('login');
- }).then(function () {
- return loginPage.login(self.currentUser.account.email, self.currentUser.account.password);
- }).then(function () {
- return expect(mainPage.isPresent('login')).not.to.eventually.be.ok;
- }).then(function () {
- self.currentPage = mainPage;
- return Promise.resolve();
- });
- });
+ await mainPage.visit();
+ await mainPage.waitForVisibilityOf('login');
+ await mainPage.click('login');
+ await loginPage.login(this.currentUser.account.email, this.currentUser.account.password);
+ await mainPage.waitForInvisibilityOf('login');
+
+ this.currentPage = mainPage;
});
diff --git a/templates/steps.js b/templates/steps.js
index 461e6942..5cf49b31 100644
--- a/templates/steps.js
+++ b/templates/steps.js
@@ -1,7 +1,5 @@
-const { matchers, variableStore, defineSupportCode } = require('kakunin');
+const { matchers, variableStore, Then } = require('kakunin');
-defineSupportCode(({ Then }) => {
- Then(/^my matcher "([^"]*)" matches "([^"]*)"$/, function (matcher, text) {
- return expect(matchers.match(variableStore.replaceTextVariables(text), matcher)).to.be.true;
- });
+Then(/^my matcher "([^"]*)" matches "([^"]*)"$/, function (matcher, text) {
+ return expect(matchers.match(variableStore.replaceTextVariables(text), matcher)).toBe(true);
});
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..554f6644
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,20 @@
+{
+ "compilerOptions": {
+ "target": "esnext",
+ "module": "commonjs",
+ "allowSyntheticDefaultImports": false,
+ "outDir": "dist",
+ "noUnusedLocals": true,
+ "noImplicitAny": false,
+ "removeComments": false
+ },
+ "exclude": [
+ "node_modules",
+ "**/*.spec.ts",
+ "dist/**"
+ ],
+ "include": [
+ "./src/kakunin.d.ts",
+ "./src/**/*.ts"
+ ]
+}
diff --git a/tsconfig.test.json b/tsconfig.test.json
new file mode 100644
index 00000000..85d69c78
--- /dev/null
+++ b/tsconfig.test.json
@@ -0,0 +1,6 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "target": "es6"
+ }
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 00000000..8becffca
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,34 @@
+{
+ "defaultSeverity": "error",
+ "extends": [
+ "tslint:recommended",
+ "tslint-config-prettier",
+ "tslint-sonarts"
+ ],
+ "linterOptions": {
+ "exclude": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+ },
+ "jsRules": {},
+ "rules": {
+ "no-extra-semicolon": false,
+ "no-empty-interface": false,
+ "object-literal-sort-keys": false,
+ "radix": false,
+ "interface-name": [true, "never-prefix"],
+ "ordered-imports": false,
+ "no-duplicate-string": false,
+ "variable-name": [true, "ban-keywords", "allow-leading-underscore", "allow-pascal-case"],
+ "interface-over-type-literal": false,
+ "no-angle-bracket-type-assertion": false,
+ "max-union-size": false,
+ "no-identical-functions": false,
+ "no-console": false,
+ "no-var-requires": false,
+ "cognitive-complexity": false,
+ "no-big-function": false
+ },
+ "rulesDirectory": []
+}
diff --git a/website/README.md b/website/README.md
index 4848df9c..d4f837f3 100644
--- a/website/README.md
+++ b/website/README.md
@@ -121,7 +121,7 @@ Id should be in lowercase - it is used in `website/sidebars.json`.
# Versifying
-Docusaurus support versifying, right know we started to using this feature from `2.4.0` Kakunin version.
+Docusaurus support versifying, right now we started to using this feature from `2.4.0` Kakunin version.
1. To add new version of documentation open `website/` folder
2. Run `yarn run version [version]` example `yarn run version 2.4.0-1`
diff --git a/website/build/Kakunin/docs/2.4.0/configuration.html b/website/build/Kakunin/docs/2.4.0/configuration.html
index 5d376d16..8da742c7 100644
--- a/website/build/Kakunin/docs/2.4.0/configuration.html
+++ b/website/build/Kakunin/docs/2.4.0/configuration.html
@@ -1,6 +1,6 @@
Configuration · Kakunin
-
+
+ 
+ 
Current npm version:
@@ -25,41 +25,51 @@
