Merge pull request 'fix: e2e' (!1289) from fix_e2e_state_and_date into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1289 Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
commit
3f1020aebf
|
@ -23,6 +23,7 @@ describe('Worker time control path', () => {
|
||||||
|
|
||||||
it('should go to the next month, go to current month and go 1 month in the past', async() => {
|
it('should go to the next month, go to current month and go 1 month in the past', async() => {
|
||||||
let date = new Date();
|
let date = new Date();
|
||||||
|
date.setDate(1);
|
||||||
date.setMonth(date.getMonth() + 1);
|
date.setMonth(date.getMonth() + 1);
|
||||||
let month = date.toLocaleString('default', {month: 'long'});
|
let month = date.toLocaleString('default', {month: 'long'});
|
||||||
|
|
||||||
|
@ -32,6 +33,7 @@ describe('Worker time control path', () => {
|
||||||
expect(result).toContain(month);
|
expect(result).toContain(month);
|
||||||
|
|
||||||
date = new Date();
|
date = new Date();
|
||||||
|
date.setDate(1);
|
||||||
month = date.toLocaleString('default', {month: 'long'});
|
month = date.toLocaleString('default', {month: 'long'});
|
||||||
|
|
||||||
await page.click(selectors.workerTimeControl.previousMonthButton);
|
await page.click(selectors.workerTimeControl.previousMonthButton);
|
||||||
|
@ -40,6 +42,7 @@ describe('Worker time control path', () => {
|
||||||
expect(result).toContain(month);
|
expect(result).toContain(month);
|
||||||
|
|
||||||
date = new Date();
|
date = new Date();
|
||||||
|
date.setDate(1);
|
||||||
date.setMonth(date.getMonth() - 1);
|
date.setMonth(date.getMonth() - 1);
|
||||||
const timestamp = Math.round(date.getTime() / 1000);
|
const timestamp = Math.round(date.getTime() / 1000);
|
||||||
month = date.toLocaleString('default', {month: 'long'});
|
month = date.toLocaleString('default', {month: 'long'});
|
||||||
|
|
|
@ -87,6 +87,7 @@ ngModule.vnComponent('vnButtonMenu', {
|
||||||
selectFields: '<?',
|
selectFields: '<?',
|
||||||
initialData: '<?',
|
initialData: '<?',
|
||||||
showFilter: '<?',
|
showFilter: '<?',
|
||||||
|
fields: '<?',
|
||||||
field: '=?',
|
field: '=?',
|
||||||
url: '@?',
|
url: '@?',
|
||||||
data: '<?',
|
data: '<?',
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
disabled="!$ctrl.isEditable"
|
disabled="!$ctrl.isEditable"
|
||||||
label="State"
|
label="State"
|
||||||
value-field="code"
|
value-field="code"
|
||||||
|
fields="['id', 'name', 'alertLevel', 'code']"
|
||||||
url="States/editableStates"
|
url="States/editableStates"
|
||||||
on-change="$ctrl.changeState(value)">
|
on-change="$ctrl.changeState(value)">
|
||||||
</vn-button-menu>
|
</vn-button-menu>
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
class="message"
|
class="message"
|
||||||
label="Change state"
|
label="Change state"
|
||||||
value-field="code"
|
value-field="code"
|
||||||
|
fields="['id', 'name', 'alertLevel', 'code']"
|
||||||
url="States/editableStates"
|
url="States/editableStates"
|
||||||
on-change="$ctrl.changeState(value)">
|
on-change="$ctrl.changeState(value)">
|
||||||
</vn-button-menu>
|
</vn-button-menu>
|
||||||
|
|
Loading…
Reference in New Issue