From 957f8ff902e48ed33ab1e1f5495a61885b964fdb Mon Sep 17 00:00:00 2001 From: Dragan Jovanovic Date: Thu, 12 Apr 2018 11:15:29 +0200 Subject: [PATCH 1/2] Partially applied cssSelector to canopy.parallell.functions.waitForElement in canopy.classic module --- src/canopy/canopy.fs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs index cff7eccb..8b4fa690 100644 --- a/src/canopy/canopy.fs +++ b/src/canopy/canopy.fs @@ -20,7 +20,7 @@ let edgeBETA = edgeBETA (* documented/actions *) let chrome = chrome (* documented/actions *) -let chromium = chromium +let chromium = chromium (* documented/actions *) let safari = safari @@ -158,7 +158,7 @@ let fastTextFromCSS selector = fastTextFromCSS selector browser let ( == ) item value = equals item value browser (* documented/assertions *) -let ( != ) cssSelector value = notEquals cssSelector value browser +let ( != ) cssSelector value = notEquals cssSelector value browser (* documented/assertions *) let ( *= ) cssSelector value = oneOrManyEquals cssSelector value browser @@ -183,12 +183,12 @@ let ( =~ ) cssSelector pattern = regexEquals cssSelector pattern browser (* documented/assertions *) let ( !=~ ) cssSelector pattern = regexNotEquals cssSelector pattern browser - + (* documented/assertions *) let ( *~ ) cssSelector pattern = oneOrManyRegexEquals cssSelector pattern browser (* documented/assertions *) -let is expected actual = is expected actual +let is expected actual = is expected actual (* documented/assertions *) let (===) expected actual = is expected actual @@ -198,7 +198,7 @@ let displayed item = displayed item browser (* documented/assertions *) let notDisplayed item = notDisplayed item browser - + (* documented/assertions *) let enabled item = enabled item browser @@ -244,7 +244,7 @@ let drag cssSelectorA cssSelectorB = drag cssSelectorA cssSelectorB //browser related (* documented/actions *) let pin direction = pin direction browser - + (* documented/actions *) let start b = browser <- start b @@ -327,4 +327,4 @@ let value = value let skip message = skip message browser (* documented/actions *) -let waitForElement cssSelector = waitForElement +let waitForElement cssSelector = waitForElement cssSelector From 09a0131f5080ae2640dc0c7eac2c556a6de761bb Mon Sep 17 00:00:00 2001 From: Dragan Jovanovic Date: Thu, 12 Apr 2018 11:18:36 +0200 Subject: [PATCH 2/2] Passing browser parameter to waitForElement to align with skip function and old canopy API --- src/canopy/canopy.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs index 8b4fa690..f03784e1 100644 --- a/src/canopy/canopy.fs +++ b/src/canopy/canopy.fs @@ -327,4 +327,4 @@ let value = value let skip message = skip message browser (* documented/actions *) -let waitForElement cssSelector = waitForElement cssSelector +let waitForElement cssSelector = waitForElement cssSelector browser