Skip to content

Commit 9a837dd

Browse files
author
DavertMik
committed
reverted change to ;
1 parent 31a0f1d commit 9a837dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+7522
-7508
lines changed

examples/fragments/Signin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
let I
1+
let I;
22

33
module.exports = {
44
_init() {
5-
I = actor()
5+
I = actor();
66
},
77

88
// insert your locators and methods here
9-
}
9+
};

examples/pages/Admin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
let I
1+
let I;
22

33
module.exports = {
44
_init() {
5-
I = actor()
5+
I = actor();
66
},
77

88
// insert your locators and methods here
9-
}
9+
};

lib/actor.js

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const Step = require('./step')
2-
const { MetaStep } = require('./step')
3-
const container = require('./container')
4-
const { methodsOfObject } = require('./utils')
5-
const recorder = require('./recorder')
6-
const event = require('./event')
7-
const store = require('./store')
8-
const output = require('./output')
1+
const Step = require('./step');
2+
const { MetaStep } = require('./step');
3+
const container = require('./container');
4+
const { methodsOfObject } = require('./utils');
5+
const recorder = require('./recorder');
6+
const event = require('./event');
7+
const store = require('./store');
8+
const output = require('./output');
99

1010
/**
1111
* @interface
@@ -21,13 +21,13 @@ class Actor {
2121
* ⚠️ returns a promise which is synchronized internally by recorder
2222
*/
2323
async say(msg, color = 'cyan') {
24-
const step = new Step('say', 'say')
25-
step.status = 'passed'
24+
const step = new Step('say', 'say');
25+
step.status = 'passed';
2626
return recordStep(step, [msg]).then(() => {
2727
// this is backward compatibility as this event may be used somewhere
28-
event.emit(event.step.comment, msg)
29-
output.say(msg, `${color}`)
30-
})
28+
event.emit(event.step.comment, msg);
29+
output.say(msg, `${color}`);
30+
});
3131
}
3232

3333
/**
@@ -38,14 +38,14 @@ class Actor {
3838
* @inner
3939
*/
4040
limitTime(timeout) {
41-
if (!store.timeouts) return this
41+
if (!store.timeouts) return this;
4242

4343
event.dispatcher.prependOnceListener(event.step.before, (step) => {
44-
output.log(`Timeout to ${step}: ${timeout}s`)
45-
step.setTimeout(timeout * 1000, Step.TIMEOUT_ORDER.codeLimitTime)
46-
})
44+
output.log(`Timeout to ${step}: ${timeout}s`);
45+
step.setTimeout(timeout * 1000, Step.TIMEOUT_ORDER.codeLimitTime);
46+
});
4747

48-
return this
48+
return this;
4949
}
5050

5151
/**
@@ -55,11 +55,11 @@ class Actor {
5555
* @inner
5656
*/
5757
retry(opts) {
58-
if (opts === undefined) opts = 1
59-
recorder.retry(opts)
58+
if (opts === undefined) opts = 1;
59+
recorder.retry(opts);
6060
// remove retry once the step passed
61-
recorder.add(() => event.dispatcher.once(event.step.finished, () => recorder.retries.pop()))
62-
return this
61+
recorder.add(() => event.dispatcher.once(event.step.finished, () => recorder.retries.pop()));
62+
return this;
6363
}
6464
}
6565

@@ -70,102 +70,102 @@ class Actor {
7070
* @ignore
7171
*/
7272
module.exports = function (obj = {}) {
73-
const actor = container.actor() || new Actor()
73+
const actor = container.actor() || new Actor();
7474

7575
// load all helpers once container initialized
7676
container.started(() => {
77-
const translation = container.translation()
78-
const helpers = container.helpers()
77+
const translation = container.translation();
78+
const helpers = container.helpers();
7979

8080
// add methods from enabled helpers
8181
Object.values(helpers).forEach((helper) => {
8282
methodsOfObject(helper, 'Helper')
8383
.filter((method) => method !== 'constructor' && method[0] !== '_')
8484
.forEach((action) => {
85-
const actionAlias = translation.actionAliasFor(action)
85+
const actionAlias = translation.actionAliasFor(action);
8686
if (!actor[action]) {
8787
actor[action] = actor[actionAlias] = function () {
88-
const step = new Step(helper, action)
88+
const step = new Step(helper, action);
8989
if (translation.loaded) {
90-
step.name = actionAlias
91-
step.actor = translation.I
90+
step.name = actionAlias;
91+
step.actor = translation.I;
9292
}
9393
// add methods to promise chain
94-
return recordStep(step, Array.from(arguments))
95-
}
94+
return recordStep(step, Array.from(arguments));
95+
};
9696
}
97-
})
98-
})
97+
});
98+
});
9999

100100
// add translated custom steps from actor
101101
Object.keys(obj).forEach((key) => {
102-
const actionAlias = translation.actionAliasFor(key)
102+
const actionAlias = translation.actionAliasFor(key);
103103
if (!actor[actionAlias]) {
104-
actor[actionAlias] = actor[key]
104+
actor[actionAlias] = actor[key];
105105
}
106-
})
106+
});
107107

108108
container.append({
109109
support: {
110110
I: actor,
111111
},
112-
})
113-
})
112+
});
113+
});
114114
// store.actor = actor;
115115
// add custom steps from actor
116116
Object.keys(obj).forEach((key) => {
117-
const ms = new MetaStep('I', key)
118-
ms.setContext(actor)
119-
actor[key] = ms.run.bind(ms, obj[key])
120-
})
117+
const ms = new MetaStep('I', key);
118+
ms.setContext(actor);
119+
actor[key] = ms.run.bind(ms, obj[key]);
120+
});
121121

122-
return actor
123-
}
122+
return actor;
123+
};
124124

125125
function recordStep(step, args) {
126-
step.status = 'queued'
127-
step.setArguments(args)
126+
step.status = 'queued';
127+
step.setArguments(args);
128128

129129
// run async before step hooks
130-
event.emit(event.step.before, step)
130+
event.emit(event.step.before, step);
131131

132-
const task = `${step.name}: ${step.humanizeArgs()}`
133-
let val
132+
const task = `${step.name}: ${step.humanizeArgs()}`;
133+
let val;
134134

135135
// run step inside promise
136136
recorder.add(
137137
task,
138138
() => {
139139
if (!step.startTime) {
140140
// step can be retries
141-
event.emit(event.step.started, step)
142-
step.startTime = Date.now()
141+
event.emit(event.step.started, step);
142+
step.startTime = Date.now();
143143
}
144-
return (val = step.run(...args))
144+
return (val = step.run(...args));
145145
},
146146
false,
147147
undefined,
148148
step.getTimeout(),
149-
)
149+
);
150150

151-
event.emit(event.step.after, step)
151+
event.emit(event.step.after, step);
152152

153153
recorder.add('step passed', () => {
154-
step.endTime = Date.now()
155-
event.emit(event.step.passed, step, val)
156-
event.emit(event.step.finished, step)
157-
})
154+
step.endTime = Date.now();
155+
event.emit(event.step.passed, step, val);
156+
event.emit(event.step.finished, step);
157+
});
158158

159159
recorder.catchWithoutStop((err) => {
160-
step.status = 'failed'
161-
step.endTime = Date.now()
162-
event.emit(event.step.failed, step)
163-
event.emit(event.step.finished, step)
164-
throw err
165-
})
166-
167-
recorder.add('return result', () => val)
160+
step.status = 'failed';
161+
step.endTime = Date.now();
162+
event.emit(event.step.failed, step);
163+
event.emit(event.step.finished, step);
164+
throw err;
165+
});
166+
167+
recorder.add('return result', () => val);
168168
// run async after step hooks
169169

170-
return recorder.promise()
170+
return recorder.promise();
171171
}

0 commit comments

Comments
 (0)