Skip to content

Commit 058d21f

Browse files
committed
MQE-571: Replace loginAsAdmin() function with an Action Group.
- Removing the loginAsAdmin() function from MagentoWebDriver. - Removing the loginAsAdmin() function from the Test Schema. - Adding @throw \Exception to function Doc Blocks. - Updating verification tests for loginAsAdmin and \Exception changes.
1 parent fda0f65 commit 058d21f

35 files changed

+137
-59
lines changed

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithDataOverrideTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/ActionGroupWithDataTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithDataTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithDataTest(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithNoArguments.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithNoArgumentsCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithNoArguments(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithNoDefaultTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithNoDefaultTest(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithPersistedData.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithPersistedDataCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithPersistedData(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I)
3031
{

dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithTopLevelPersistedDataCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ArgumentWithSameNameAsElementCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ArgumentWithSameNameAsElement(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/AssertTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class AssertTestCest
3636
* @Parameter(name = "AcceptanceTester", value="$I")
3737
* @param AcceptanceTester $I
3838
* @return void
39+
* @throws \Exception
3940
*/
4041
public function AssertTest(AcceptanceTester $I)
4142
{

dev/tests/verification/Resources/BasicActionGroupTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class BasicActionGroupTestCest
4343
* @Parameter(name = "AcceptanceTester", value="$I")
4444
* @param AcceptanceTester $I
4545
* @return void
46+
* @throws \Exception
4647
*/
4748
public function BasicActionGroupTest(AcceptanceTester $I)
4849
{

dev/tests/verification/Resources/BasicFunctionalTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class BasicFunctionalTestCest
3838
* @Parameter(name = "AcceptanceTester", value="$I")
3939
* @param AcceptanceTester $I
4040
* @return void
41+
* @throws \Exception
4142
*/
4243
public function BasicFunctionalTest(AcceptanceTester $I)
4344
{

dev/tests/verification/Resources/DataReplacementTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class DataReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function DataReplacementTest(AcceptanceTester $I)
2829
{

dev/tests/verification/Resources/LocatorFunctionTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class LocatorFunctionTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function LocatorFunctionTest(AcceptanceTester $I)
2829
{

dev/tests/verification/Resources/MergeFunctionalTest.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class MergeFunctionalTestCest
3939
* @Parameter(name = "AcceptanceTester", value="$I")
4040
* @param AcceptanceTester $I
4141
* @return void
42+
* @throws \Exception
4243
*/
4344
public function BasicMergeTest(AcceptanceTester $I)
4445
{
@@ -61,6 +62,7 @@ class MergeFunctionalTestCest
6162
* @Parameter(name = "AcceptanceTester", value="$I")
6263
* @param AcceptanceTester $I
6364
* @return void
65+
* @throws \Exception
6466
*/
6567
public function MergedReferencesTest(AcceptanceTester $I)
6668
{

dev/tests/verification/Resources/MergedActionGroupTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class MergedActionGroupTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function MergedActionGroupTest(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/MultipleActionGroupsTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class MultipleActionGroupsTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function MultipleActionGroupsTest(AcceptanceTester $I)
5455
{

dev/tests/verification/Resources/PageReplacementTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class PageReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function PageReplacementTest(AcceptanceTester $I)
2829
{

dev/tests/verification/Resources/ParameterArrayTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ParameterArrayTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function ParameterArrayTest(AcceptanceTester $I)
2829
{

dev/tests/verification/Resources/PersistedReplacementTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class PersistedReplacementTestCest
3636
* @Parameter(name = "AcceptanceTester", value="$I")
3737
* @param AcceptanceTester $I
3838
* @return void
39+
* @throws \Exception
3940
*/
4041
public function PersistedReplacementTest(AcceptanceTester $I)
4142
{

dev/tests/verification/Resources/SectionReplacementTest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class SectionReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function SectionReplacementTest(AcceptanceTester $I)
2829
{

dev/tests/verification/Tests/ActionGroupGenerationTest.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ class ActionGroupGenerationTest extends TestCase
1515

1616
/**
1717
* Tests flat generation of a hardcoded test file with no external references.
18+
*
19+
* @throws \Exception
20+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
1821
*/
1922
private function validateGenerateAndContents($testName)
2023
{
@@ -30,6 +33,9 @@ private function validateGenerateAndContents($testName)
3033

3134
/**
3235
* Test generation of a test referencing an action group with no arguments
36+
*
37+
* @throws \Exception
38+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
3339
*/
3440
public function testActionGroupWithNoArguments()
3541
{
@@ -38,6 +44,9 @@ public function testActionGroupWithNoArguments()
3844

3945
/**
4046
* Test generation of a test referencing an action group with default arguments and string selector
47+
*
48+
* @throws \Exception
49+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
4150
*/
4251
public function testActionGroupWithDefaultArgumentAndStringSelectorParam()
4352
{
@@ -46,6 +55,9 @@ public function testActionGroupWithDefaultArgumentAndStringSelectorParam()
4655

4756
/**
4857
* Test generation of a test referencing an action group with passed arguments
58+
*
59+
* @throws \Exception
60+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
4961
*/
5062
public function testActionGroupWithPassedArgumentAndStringSelectorParam()
5163
{
@@ -54,6 +66,9 @@ public function testActionGroupWithPassedArgumentAndStringSelectorParam()
5466

5567
/**
5668
* Test generation of a test referencing an action group with single parameter selector and default arguments
69+
*
70+
* @throws \Exception
71+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
5772
*/
5873
public function testActionGroupWithSingleParameterSelectorFromDefaultArgument()
5974
{
@@ -62,6 +77,9 @@ public function testActionGroupWithSingleParameterSelectorFromDefaultArgument()
6277

6378
/**
6479
* Test generation of test referencing an action group with single parameter from a passed arguemnt
80+
*
81+
* @throws \Exception
82+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
6583
*/
6684
public function testActionGroupWithSingleParameterSelectorFromPassedArgument()
6785
{
@@ -70,6 +88,9 @@ public function testActionGroupWithSingleParameterSelectorFromPassedArgument()
7088

7189
/**
7290
* Test generation of a test referencing an action group with multiple parameter selectors and default arguments
91+
*
92+
* @throws \Exception
93+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
7394
*/
7495
public function testActionGroupWithMultipleParameterSelectorsFromDefaultArgument()
7596
{

dev/tests/verification/Tests/ActionGroupMergeGenerationTest.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class ActionGroupMergeGenerationTest extends TestCase
1616

1717
/**
1818
* Tests flat generation of a hardcoded test file with no external references.
19+
*
20+
* @throws \Exception
21+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
1922
*/
2023
public function testBasicActionGroup()
2124
{
@@ -24,6 +27,9 @@ public function testBasicActionGroup()
2427

2528
/**
2629
* Test an ordinary action group with data
30+
*
31+
* @throws \Exception
32+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
2733
*/
2834
public function testActionGroupWithData()
2935
{
@@ -32,6 +38,9 @@ public function testActionGroupWithData()
3238

3339
/**
3440
* Test an action group with data overridden in arguments
41+
*
42+
* @throws \Exception
43+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
3544
*/
3645
public function testActionGroupWithDataOverride()
3746
{
@@ -40,6 +49,9 @@ public function testActionGroupWithDataOverride()
4049

4150
/**
4251
* Test an action group with no default data
52+
*
53+
* @throws \Exception
54+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
4355
*/
4456
public function testActionGroupWithNoDefault()
4557
{
@@ -48,6 +60,9 @@ public function testActionGroupWithNoDefault()
4860

4961
/**
5062
* Test an action group with persisted data
63+
*
64+
* @throws \Exception
65+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
5166
*/
5267
public function testActionGroupWithPersistedData()
5368
{
@@ -56,6 +71,9 @@ public function testActionGroupWithPersistedData()
5671

5772
/**
5873
* Test an action group with top level persisted data
74+
*
75+
* @throws \Exception
76+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
5977
*/
6078
public function testActionGroupWithTopLevelPersistedData()
6179
{
@@ -64,6 +82,9 @@ public function testActionGroupWithTopLevelPersistedData()
6482

6583
/**
6684
* Test an action group called multiple times
85+
*
86+
* @throws \Exception
87+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
6788
*/
6889
public function testMultipleActionGroups()
6990
{
@@ -72,6 +93,9 @@ public function testMultipleActionGroups()
7293

7394
/**
7495
* Test an action group with a merge counterpart
96+
*
97+
* @throws \Exception
98+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
7599
*/
76100
public function testMergedActionGroup()
77101
{
@@ -80,6 +104,9 @@ public function testMergedActionGroup()
80104

81105
/**
82106
* Test an action group with arguments named similarly to elements
107+
*
108+
* @throws \Exception
109+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
83110
*/
84111
public function testArgumentWithSameNameAsElement()
85112
{
@@ -90,6 +117,8 @@ public function testArgumentWithSameNameAsElement()
90117
* Generate a Test by name and assert that it equals the corresponding .txt source of truth
91118
*
92119
* @param string $testName
120+
* @throws \Exception
121+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
93122
*/
94123
private function runComparisonTest($testName)
95124
{

dev/tests/verification/Tests/AssertGenerationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class AssertGenerationTest extends TestCase
1616

1717
/**
1818
* Tests assert generation.
19+
*
20+
* @throws \Exception
21+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
1922
*/
2023
public function testAssertGeneration()
2124
{

dev/tests/verification/Tests/BasicCestGenerationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class BasicCestGenerationTest extends TestCase
1616

1717
/**
1818
* Tests flat generation of a hardcoded test file with no external references.
19+
*
20+
* @throws \Exception
21+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
1922
*/
2023
public function testBasicGeneration()
2124
{

dev/tests/verification/Tests/LocatorFunctionGenerationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class LocatorFunctionGenerationTest extends TestCase
1616

1717
/**
1818
* Tests generation of actions using elements that have a LocatorFunction.
19+
*
20+
* @throws \Exception
21+
* @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
1922
*/
2023
public function testLocatorFunctionGeneration()
2124
{

0 commit comments

Comments
 (0)