diff --git a/docs/modules/plugins/pages/plugin-mobile-app.adoc b/docs/modules/plugins/pages/plugin-mobile-app.adoc index 6868f254db..5423823463 100644 --- a/docs/modules/plugins/pages/plugin-mobile-app.adoc +++ b/docs/modules/plugins/pages/plugin-mobile-app.adoc @@ -578,12 +578,6 @@ The atomic actions performed are: When I tap on element located by `$locator` ---- -_Deprecated syntax (will be removed in VIVIDUS 0.6.0)_: -[source,gherkin] ----- -When I tap on element located `$locator` ----- - * `$locator` - <<_locator>>. .Tap on element @@ -608,12 +602,6 @@ The atomic actions performed are: When I tap on element located by `$locator` with duration `$duration` ---- -_Deprecated syntax (will be removed in VIVIDUS 0.6.0)_: -[source,gherkin] ----- -When I tap on element located `$locator` with duration `$duration` ----- - * `$locator` - <<_locator>>. * `$duration` - The duration between an element is pressed and released in {durations-format-link} format. @@ -845,12 +833,6 @@ the element, you need to switch the context to this element. When I swipe $direction to element located by `$locator` with duration $swipeDuration ---- -_Deprecated syntax (will be removed in VIVIDUS 0.6.0)_: -[source,gherkin] ----- -When I swipe $direction to element located `$locator` with duration $swipeDuration ----- - * `$direction` - The direction to swipe: `UP`, `DOWN`, `LEFT` or `RIGHT`. * `$locator` - <<_locator>>. * `$swipeDuration` - The swipe duration in {durations-format-link} format. @@ -869,7 +851,7 @@ Then number of elements found by `accessibilityId(end-of-screen)` is equal to `1 Scenario: Switch slides When I change context to element located by `accessibilityId(carousel)` Then number of elements found by `accessibilityId(slide 2)` is equal to `0` -When I swipe LEFT to element located `accessibilityId(slide 2)` with duration PT1S +When I swipe LEFT to element located by `accessibilityId(slide 2)` with duration PT1S Then number of elements found by `accessibilityId(slide 2)` is equal to `1` ---- diff --git a/vividus-plugin-mobile-app/src/main/resources/steps/defaults/composite.steps b/vividus-plugin-mobile-app/src/main/resources/steps/defaults/composite.steps deleted file mode 100644 index 3d9697a107..0000000000 --- a/vividus-plugin-mobile-app/src/main/resources/steps/defaults/composite.steps +++ /dev/null @@ -1,14 +0,0 @@ -Composite: When I tap on element located `$locator` with duration `$duration` -Priority: 1 -!-- DEPRECATED: 0.6.0, When I tap on element located by `%1$s` with duration `%2$s` -When I tap on element located by `` with duration `` - - -Composite: When I tap on element located `$locator` -!-- DEPRECATED: 0.6.0, When I tap on element located by `%1$s` -When I tap on element located by `` - - -Composite: When I swipe $direction to element located `$locator` with duration $swipeDuration -!-- DEPRECATED: 0.6.0, When I swipe %1$s to element located by `%2$s` with duration %3$s -When I swipe to element located by `` with duration diff --git a/vividus-tests/src/main/resources/story/system/mobile_app/MobileAppStepsTests.story b/vividus-tests/src/main/resources/story/system/mobile_app/MobileAppStepsTests.story index 5c38d3af50..abf2b31671 100644 --- a/vividus-tests/src/main/resources/story/system/mobile_app/MobileAppStepsTests.story +++ b/vividus-tests/src/main/resources/story/system/mobile_app/MobileAppStepsTests.story @@ -22,8 +22,7 @@ Scenario: Verify step: 'When I reinstall mobile application with bundle identifi Meta: @requirementId 2073 When I tap on element located by `accessibilityId(menuToggler)` -!-- Deprecated, replace with "When I tap on element located by `$locator`" after removal -When I tap on element located `xpath()` +When I tap on element located by `xpath()` When I reinstall mobile application with bundle identifier `${main-app}` When I wait until element located by `xpath()->filter.text(Home)` appears @@ -90,10 +89,6 @@ Scenario: Verify step: 'When I tap on element located by `$locator` with duratio Then number of elements found by `xpath()` is equal to `0` When I tap on element located by `accessibilityId(menuToggler)` with duration `PT0.5S` Then number of elements found by `xpath()` is equal to `1` -!-- Deprecated, remove the rest of scenario after "When I tap on element located `$locator` with duration `$duration`" removal -When I tap on element located `xpath()` with duration `PT0.5S` -Then number of elements found by `xpath()` is equal to `0` -When I tap on element located by `accessibilityId(menuToggler)` Scenario: Verify step: 'When I tap on element located by `$locator`' and Attribute Filter @@ -212,8 +207,7 @@ When I tap on element located by `accessibilityId(menuToggler)` When I tap on element located by `xpath()` Then number of elements found by `accessibilityId(header)` is equal to `1` Then number of elements found by `accessibilityId(footer)` is equal to `0` -!-- Deprecated, replace with "When I swipe $direction to element located by `$locator` with duration $swipeDuration`" after removal -When I swipe UP to element located `accessibilityId(footer)` with duration PT1S +When I swipe UP to element located by `accessibilityId(footer)` with duration PT1S Then number of elements found by `accessibilityId(header)` is equal to `0` Then number of elements found by `accessibilityId(footer)` is equal to `1` When I swipe DOWN to element located by `accessibilityId(header)` with duration PT1S @@ -248,7 +242,7 @@ Meta: When I tap on element located by `accessibilityId(menuToggler)` When I tap on element located by `iosClassChain(**/XCUIElementTypeButton[$name == "Image"$])` When I upload file `/data/mobile-upload-image.png` to device -When I tap on element located `iosNsPredicate(name == 'selectImage')` +When I tap on element located by `iosNsPredicate(name == 'selectImage')` When I wait until element located by `accessibilityId(Photos)` appears When I tap on element located by `xpath((//XCUIElementTypeImage[contains(@name, "Photo")])[1])` Then number of elements found by `xpath(//XCUIElementTypeStaticText[@value='228x228'])` is equal to `1` diff --git a/vividus-tests/src/main/resources/story/system/mobile_app/VisualTesting.story b/vividus-tests/src/main/resources/story/system/mobile_app/VisualTesting.story index 5993a6c72e..21e8bb6bac 100644 --- a/vividus-tests/src/main/resources/story/system/mobile_app/VisualTesting.story +++ b/vividus-tests/src/main/resources/story/system/mobile_app/VisualTesting.story @@ -103,8 +103,8 @@ Examples: Scenario: Verify contextual check with ignored element -When I tap on element located `accessibilityId(menuToggler)` -When I tap on element located `xpath()` +When I tap on element located by `accessibilityId(menuToggler)` +When I tap on element located by `xpath()` When I wait until element located by `xpath()` appears When I change context to element located by `xpath()` When I baseline with name `${target-platform}-context-with-ignore` ignoring: