From 1afdb8e4e18be9f3aa908e0d36302124edab95a8 Mon Sep 17 00:00:00 2001 From: Diego Fernandes Date: Thu, 25 Feb 2021 19:08:50 -0300 Subject: [PATCH 1/5] teste2 --- .../Unit\303\241rios/Steps_definition/automation_01.feature" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" index b669bcd..fc53d79 100644 --- "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" +++ "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" @@ -8,4 +8,4 @@ Scenario: Search button and click Given i'm in home page And see botton buy And give data - When click in this botton + When click in this bottonn From 3eec6de67aeb6aa808f88cc7608bbe86d4061df6 Mon Sep 17 00:00:00 2001 From: Diego Fernandes Date: Thu, 25 Feb 2021 19:17:32 -0300 Subject: [PATCH 2/5] refactor3 --- .../Steps_definition/automation_01.feature" | 6 ++++++ 1 file changed, 6 insertions(+) diff --git "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" index b669bcd..ff3e229 100644 --- "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" +++ "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" @@ -9,3 +9,9 @@ Scenario: Search button and click And see botton buy And give data When click in this botton + +Scenario: Search button and click + Given i'm in home page + And see botton buy + And give data + When click in this bottonns From 902abdef7246b63b8c9faa6c40cacda1208e7998 Mon Sep 17 00:00:00 2001 From: Diego Fernandes Date: Thu, 25 Feb 2021 19:34:48 -0300 Subject: [PATCH 3/5] merge teste --- .../Unit\303\241rios/Steps_definition/automation_01.feature" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" index b669bcd..268b646 100644 --- "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" +++ "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" @@ -4,7 +4,7 @@ Scenario: Search button and click And see botton buy When click in this botton -Scenario: Search button and click +Scenario: Second button and click Given i'm in home page And see botton buy And give data From 2717c2550ebabb9c520318b22dc0ef13e55ec3f1 Mon Sep 17 00:00:00 2001 From: Diego Fernandes Date: Thu, 25 Feb 2021 19:35:57 -0300 Subject: [PATCH 4/5] mais um commit --- .../Steps_definition/automation_01.feature" | 6 ++++++ 1 file changed, 6 insertions(+) diff --git "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" index 268b646..e666767 100644 --- "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" +++ "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" @@ -9,3 +9,9 @@ Scenario: Second button and click And see botton buy And give data When click in this botton + +Scenario: Third button and click + Given i'm in home page + And see botton buy + And give data + When click in this botton From 011f621cea775307e7cbb5d0aa1e726f9974c893 Mon Sep 17 00:00:00 2001 From: Diego Fernandes Date: Thu, 25 Feb 2021 19:37:39 -0300 Subject: [PATCH 5/5] mais um commit do outro lado --- .../Unit\303\241rios/Steps_definition/automation_01.feature" | 3 --- 1 file changed, 3 deletions(-) diff --git "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" index 089af9b..7521cbf 100644 --- "a/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" +++ "b/Ruby for QA/Unit\303\241rios/Steps_definition/automation_01.feature" @@ -8,7 +8,6 @@ Scenario: Search button and click Given i'm in home page And see botton buy And give data -<<<<<<< HEAD When click in this botton Scenario: Search button and click @@ -16,6 +15,4 @@ Scenario: Search button and click And see botton buy And give data When click in this bottonns -======= When click in this bottonn ->>>>>>> df-second-branch