From e247d5a4cf6892a9cc7f5b3b4b7de4354e720471 Mon Sep 17 00:00:00 2001 From: Jongheon Kim Date: Wed, 8 May 2019 21:47:41 +0900 Subject: [PATCH 1/4] Added set default value when select 'wait for...' command --- packages/selenium-ide/src/neo/models/Command/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/selenium-ide/src/neo/models/Command/index.js b/packages/selenium-ide/src/neo/models/Command/index.js index 4822b85c4f..3ac19a6fa3 100644 --- a/packages/selenium-ide/src/neo/models/Command/index.js +++ b/packages/selenium-ide/src/neo/models/Command/index.js @@ -106,6 +106,10 @@ export default class Command { if (!this.canHaveTargets) { this.setTargets() } + + if (this.command.indexOf('waitFor') > -1) { + this.setValue('30000') + } } @action.bound From 28a773d9ba90ca2cab6d49b78588041ce67a4890 Mon Sep 17 00:00:00 2001 From: Jongheon Kim Date: Wed, 15 May 2019 23:09:55 +0900 Subject: [PATCH 2/4] Added conditional statement to check empty string --- packages/selenium-ide/src/neo/models/Command/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/selenium-ide/src/neo/models/Command/index.js b/packages/selenium-ide/src/neo/models/Command/index.js index 3ac19a6fa3..c426700e18 100644 --- a/packages/selenium-ide/src/neo/models/Command/index.js +++ b/packages/selenium-ide/src/neo/models/Command/index.js @@ -107,7 +107,7 @@ export default class Command { this.setTargets() } - if (this.command.indexOf('waitFor') > -1) { + if (this.command.indexOf('waitFor') > -1 && this.value === '') { this.setValue('30000') } } From 09ce690d23eb1f21c4772cd546a48f0ed073981a Mon Sep 17 00:00:00 2001 From: Jongheon Kim Date: Wed, 15 May 2019 23:13:15 +0900 Subject: [PATCH 3/4] Added set value test about 'wait for' command --- .../src/neo/__test__/models/Command.spec.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/selenium-ide/src/neo/__test__/models/Command.spec.js b/packages/selenium-ide/src/neo/__test__/models/Command.spec.js index 3a8ebe87c3..87df10907d 100644 --- a/packages/selenium-ide/src/neo/__test__/models/Command.spec.js +++ b/packages/selenium-ide/src/neo/__test__/models/Command.spec.js @@ -206,6 +206,19 @@ describe('Command', () => { expect(command.windowTimeout).toBe(jsRepresentation.windowTimeout) expect(command instanceof Command).toBeTruthy() }) + + it('should set default value in the wait for command when there is no value', () => { + const command = new Command() + command.setCommand('wait for element present') + expect(command.value).toBe('30000') + }) + + it('should set value in the wait for command when there is a value', () => { + const command = new Command() + command.setCommand('wait for element editable') + command.setValue('50000') + expect(command.value).toBe('50000') + }) }) describe('Commands enum', () => { From 0697d9b555ca0bee8b370ac2b7d71052843f963a Mon Sep 17 00:00:00 2001 From: Jongheon Kim Date: Wed, 15 May 2019 23:41:07 +0900 Subject: [PATCH 4/4] Added set value validation test --- .../src/neo/__test__/models/Command.spec.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/selenium-ide/src/neo/__test__/models/Command.spec.js b/packages/selenium-ide/src/neo/__test__/models/Command.spec.js index 87df10907d..73b92e03cb 100644 --- a/packages/selenium-ide/src/neo/__test__/models/Command.spec.js +++ b/packages/selenium-ide/src/neo/__test__/models/Command.spec.js @@ -207,17 +207,18 @@ describe('Command', () => { expect(command instanceof Command).toBeTruthy() }) - it('should set default value in the wait for command when there is no value', () => { + it('should not overridden value when replace command', () => { const command = new Command() + command.setCommand('assert text') + command.setValue('Hello World') command.setCommand('wait for element present') - expect(command.value).toBe('30000') + expect(command.value).toBe('Hello World') }) - it('should set value in the wait for command when there is a value', () => { + it("should not set value for commands that do not start with 'wait for'", () => { const command = new Command() - command.setCommand('wait for element editable') - command.setValue('50000') - expect(command.value).toBe('50000') + command.setCommand('click') + expect(command.value).toBe('') }) })