Skip to content

Commit 0618919

Browse files
committed
update test projects to new standard
1 parent 449bcda commit 0618919

File tree

6 files changed

+17
-127
lines changed

6 files changed

+17
-127
lines changed

tests/examples/check-examples.side

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,5 @@
8080
}],
8181
"urls": ["https://en.wikipedia.org/"],
8282
"plugins": [],
83-
"version": "1.0",
84-
"code": {
85-
"suites": [{
86-
"name": "checks",
87-
"persistSession": false,
88-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"checks\", () => {it(\"check-examples\", async () => {await tests.check_examples(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
89-
}],
90-
"tests": [{
91-
"name": "check-examples",
92-
"code": "tests.check_examples = async function check_examples(driver, vars) {await driver.get(BASE_URL + \"/check.html\");await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.not.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.not.toBeChecked();}"
93-
}]
94-
},
95-
"dependencies": {}
96-
}
83+
"version": "1.0"
84+
}

tests/examples/execute-script.side

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,5 @@
7777
}],
7878
"urls": ["https://en.wikipedia.org/", "http://localhost:5000/"],
7979
"plugins": [],
80-
"version": "1.0",
81-
"code": {
82-
"suites": [{
83-
"name": "execute script",
84-
"persistSession": false,
85-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80/';let vars = {};jest.setTimeout(300000);describe(\"execute script\", () => {it(\"execute async script\", async () => {await tests.execute_async_script(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"execute script\", async () => {await tests.execute_script(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
86-
}],
87-
"tests": [{
88-
"name": "execute script",
89-
"code": "tests.execute_script = async function execute_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"sync\"] = await driver.executeScript(`return \"sync\"`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.sync}`);});});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`sync`);}"
90-
}, {
91-
"name": "execute async script",
92-
"code": "tests.execute_async_script = async function execute_async_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"async\"] = await driver.executeAsyncScript(`var callback = arguments[arguments.length - 1];return new Promise((r) => {setTimeout(() => {r(\"async\")}, 500)}).then(callback).catch(callback);`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.async}`);});});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`async`);}"
93-
}]
94-
},
95-
"dependencies": {}
96-
}
80+
"version": "1.0"
81+
}

tests/examples/nginx-examples.side

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
}, {
264264
"id": "62aba19e-1df8-453a-adf5-5b66d19efcc1",
265265
"comment": "",
266-
"command": "webdriverChooseOkOnNextConfirmation",
266+
"command": "webdriverChooseOkOnVisibleConfirmation",
267267
"target": "",
268268
"targets": [],
269269
"value": ""
@@ -298,7 +298,7 @@
298298
}, {
299299
"id": "f60f098f-ef36-4f35-9947-9dfc1d713d9f",
300300
"comment": "",
301-
"command": "webdriverChooseCancelOnNextConfirmation",
301+
"command": "webdriverChooseCancelOnVisibleConfirmation",
302302
"target": "",
303303
"targets": [],
304304
"value": ""
@@ -344,7 +344,7 @@
344344
}, {
345345
"id": "14904a55-9a9b-4982-8763-49563c849493",
346346
"comment": "",
347-
"command": "webdriverChooseCancelOnNextPrompt",
347+
"command": "webdriverChooseCancelOnVisiblePrompt",
348348
"target": "",
349349
"targets": [],
350350
"value": ""
@@ -379,7 +379,7 @@
379379
}, {
380380
"id": "879ac9d9-32da-4ae3-a124-75c09aae52b3",
381381
"comment": "",
382-
"command": "webdriverAnswerOnNextPrompt",
382+
"command": "webdriverAnswerOnVisiblePrompt",
383383
"target": "",
384384
"targets": [],
385385
"value": ""
@@ -414,7 +414,7 @@
414414
}, {
415415
"id": "f6ccc7a8-e6b1-43c4-b361-d1b7432ea83e",
416416
"comment": "",
417-
"command": "webdriverAnswerOnNextPrompt",
417+
"command": "webdriverAnswerOnVisiblePrompt",
418418
"target": "selenium",
419419
"targets": [],
420420
"value": ""
@@ -451,46 +451,5 @@
451451
}],
452452
"urls": ["https://en.wikipedia.org/", "http://localhost:5000/"],
453453
"plugins": [],
454-
"version": "1.0",
455-
"code": {
456-
"suites": [{
457-
"name": "inputs",
458-
"persistSession": false,
459-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"inputs\", () => {it(\"input editable\", async () => {await tests.input_editable(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"input type checkbox\", async () => {await tests.input_type_checkbox(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"input type text\", async () => {await tests.input_type_text(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"select\", async () => {await tests.select(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
460-
}, {
461-
"name": "waits",
462-
"persistSession": false,
463-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"waits\", () => {it(\"wait implicit\", async () => {await tests.wait_implicit(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
464-
}, {
465-
"name": "popups",
466-
"persistSession": false,
467-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"popups\", () => {it(\"popup alert\", async () => {await tests.popup_alert(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"popup confirmation\", async () => {await tests.popup_confirmation(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"popup prompt\", async () => {await tests.popup_prompt(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
468-
}],
469-
"tests": [{
470-
"name": "input type text",
471-
"code": "tests.input_type_text = async function input_type_text(driver, vars) {await driver.get(BASE_URL + \"/value.html\");await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`test`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {element.clear().then(() => {element.sendKeys(`selenium`);});});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`selenium`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {driver.actions().click(element).sendKeys(`-ide`).perform();});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`selenium-ide`);}"
472-
}, {
473-
"name": "input type checkbox",
474-
"code": "tests.input_type_checkbox = async function input_type_checkbox(driver, vars) {await driver.get(BASE_URL + \"/check.html\");await driver.wait(until.elementLocated(By.id(`t`)), configuration.timeout);await expect(driver.findElement(By.id(`t`))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.not.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => {driver.actions().click(element).perform();});await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.toBeChecked();}"
475-
}, {
476-
"name": "input editable",
477-
"code": "tests.input_editable = async function input_editable(driver, vars) {await driver.get(BASE_URL + \"/editable.html\");await driver.wait(until.elementLocated(By.id(`d`)), configuration.timeout);await expect(driver.findElement(By.id(`d`))).resolves.not.toBeEditable();await driver.wait(until.elementLocated(By.id(`r`)), configuration.timeout);await expect(driver.findElement(By.id(`r`))).resolves.not.toBeEditable();await driver.wait(until.elementLocated(By.id(`e`)), configuration.timeout);await expect(driver.findElement(By.id(`e`))).resolves.toBeEditable();await driver.wait(until.elementLocated(By.id(`e`)), configuration.timeout);await driver.findElement(By.id(`e`)).then(element => {element.clear().then(() => {element.sendKeys(`selenium`);});});await driver.wait(until.elementLocated(By.id(`e`)), configuration.timeout);await expect(driver.findElement(By.id(`e`))).resolves.toHaveValue(`selenium`);}"
478-
}, {
479-
"name": "select",
480-
"code": "tests.select = async function select(driver, vars) {await driver.get(BASE_URL + \"/select.html\");await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await expect(driver.findElement(By.id(`select`))).resolves.toHaveSelectedValue(`1`);await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await driver.findElement(By.id(`select`)).then(element => {element.findElement(By.xpath(`//option[. = 'Two']`)).then(option => {option.click();});});await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await expect(driver.findElement(By.id(`select`))).resolves.toHaveSelectedValue(`2`);}"
481-
}, {
482-
"name": "wait implicit",
483-
"code": "tests.wait_implicit = async function wait_implicit(driver, vars) {await driver.get(BASE_URL + \"/wait/implicit.html\");await expect(driver.findElements(By.id(`t`))).resolves.not.toBePresent();await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.wait(until.elementLocated(By.id(`t`)), configuration.timeout);await expect(driver.findElement(By.id(`t`))).resolves.toHaveText(`selenium`);}"
484-
}, {
485-
"name": "popup alert",
486-
"code": "tests.popup_alert = async function popup_alert(driver, vars) {await driver.get(BASE_URL + \"/popup/alert.html\");await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);alert.accept();});});await driver.getTitle().then(title => {expect(title).toBe(`changed`);});}"
487-
}, {
488-
"name": "popup confirmation",
489-
"code": "tests.popup_confirmation = async function popup_confirmation(driver, vars) {await driver.get(BASE_URL + \"/popup/confirm.html\");await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);});});await driver.switchTo().alert().then(alert => {alert.accept();});await driver.getTitle().then(title => {expect(title).toBe(`ok`);});await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);});});await driver.switchTo().alert().then(alert => {alert.dismiss();});await driver.getTitle().then(title => {expect(title).toBe(`cancel`);});}"
490-
}, {
491-
"name": "popup prompt",
492-
"code": "tests.popup_prompt = async function popup_prompt(driver, vars) {await driver.get(BASE_URL + \"/popup/prompt.html\");await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);});});await driver.switchTo().alert().then(alert => {alert.dismiss();});await driver.getTitle().then(title => {expect(title).toBe(`cancel`);});await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);});});await driver.switchTo().alert().then(alert => {alert.sendKeys(``).then(() => {alert.accept();});});await driver.getTitle().then(title => {expect(title).toBe(`empty`);});await driver.wait(until.elementLocated(By.id(`b`)), configuration.timeout);await driver.findElement(By.id(`b`)).then(element => {driver.actions().click(element).perform();});await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(`test`);});});await driver.switchTo().alert().then(alert => {alert.sendKeys(`selenium`).then(() => {alert.accept();});});await driver.getTitle().then(title => {expect(title).toBe(`selenium`);});}"
493-
}]
494-
},
495-
"dependencies": {}
496-
}
454+
"version": "1.0"
455+
}

tests/examples/select-examples.side

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,5 @@
7070
}],
7171
"urls": ["https://en.wikipedia.org/"],
7272
"plugins": [],
73-
"version": "1.0",
74-
"code": {
75-
"suites": [{
76-
"name": "select",
77-
"persistSession": false,
78-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"select\", () => {it(\"select-verify-labels\", async () => {await tests.select_verify_labels(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"select strategies\", async () => {await tests.select_strategies(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
79-
}],
80-
"tests": [{
81-
"name": "select-verify-labels",
82-
"code": "tests.select_verify_labels = async function select_verify_labels(driver, vars) {await driver.get(BASE_URL + \"/select.html\");await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await driver.findElement(By.id(`select`)).then(element => {element.getAttribute(\"value\").then(selectedValue => {element.findElement(By.xpath('option[@value=\"'+selectedValue+'\"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe(`One`);});});});});await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await driver.findElement(By.id(`select`)).then(element => {element.getAttribute(\"value\").then(selectedValue => {element.findElement(By.xpath('option[@value=\"'+selectedValue+'\"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe(`One`);});});});});}"
83-
}, {
84-
"name": "select strategies",
85-
"code": "tests.select_strategies = async function select_strategies(driver, vars) {await driver.get(BASE_URL + \"/select.html\");vars[\"label\"] = `Two`;await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await driver.findElement(By.id(`select`)).then(element => {element.findElement(By.xpath(`//option[. = '${vars.label}']`)).then(option => {option.click();});});await driver.wait(until.elementLocated(By.id(`select`)), configuration.timeout);await driver.findElement(By.id(`select`)).then(element => {element.getAttribute(\"value\").then(selectedValue => {element.findElement(By.xpath('option[@value=\"'+selectedValue+'\"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe(`Two`);});});});});}"
86-
}]
87-
},
88-
"dependencies": {}
89-
}
73+
"version": "1.0"
74+
}

tests/examples/store-examples.side

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,5 @@
9898
}],
9999
"urls": ["https://en.wikipedia.org/", "http://localhost:5000/"],
100100
"plugins": [],
101-
"version": "1.0",
102-
"code": {
103-
"suites": [{
104-
"name": "store",
105-
"persistSession": false,
106-
"code": "global.BASE_URL = configuration.baseUrl || 'http://nginx:80';let vars = {};jest.setTimeout(300000);describe(\"store\", () => {it(\"attributes\", async () => {await tests.attributes(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});it(\"xpath count\", async () => {await tests.xpath_count(driver, vars);await driver.getTitle().then(title => {expect(title).toBeDefined();});});});"
107-
}],
108-
"tests": [{
109-
"name": "attributes",
110-
"code": "tests.attributes = async function attributes(driver, vars) {await driver.get(BASE_URL + \"/store/attributes.html\");await driver.wait(until.elementLocated(By.id(`test-id-1`)), configuration.timeout);await driver.findElement(By.id(`test-id-1`)).then(element => element.getAttribute(\"style\").then(attribute => {vars[\"var1\"] = attribute;}));await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await driver.findElement(By.id(`test`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.var1}`);});});await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await expect(driver.findElement(By.id(`test`))).resolves.toHaveValue(`color: blue;`);}"
111-
}, {
112-
"name": "xpath count",
113-
"code": "tests.xpath_count = async function xpath_count(driver, vars) {await driver.get(BASE_URL + \"/store/nodes.html\");await driver.wait(until.elementsLocated(By.xpath(`//span`)), configuration.timeout);await driver.findElements(By.xpath(`//span`)).then(elements => {vars[\"span_count\"] = elements.length;});await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await driver.findElement(By.id(`test`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.span_count}`);});});await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await expect(driver.findElement(By.id(`test`))).resolves.toHaveValue(`10`);await driver.wait(until.elementsLocated(By.xpath(`//div[contains(@class, \\\"testclass\\\")]`)), configuration.timeout);await driver.findElements(By.xpath(`//div[contains(@class, \\\"testclass\\\")]`)).then(elements => {vars[\"div_count\"] = elements.length;});await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await driver.findElement(By.id(`test`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.div_count}`);});});await driver.wait(until.elementLocated(By.id(`test`)), configuration.timeout);await expect(driver.findElement(By.id(`test`))).resolves.toHaveValue(`6`);}"
114-
}]
115-
},
116-
"dependencies": {}
117-
}
101+
"version": "1.0"
102+
}

0 commit comments

Comments
 (0)