@@ -55,9 +55,6 @@ class AssertSuccessInstall extends AbstractConstraint
55
55
*/
56
56
public function processAssert (Install $ installPage , InstallConfig $ installConfig , User $ user )
57
57
{
58
- //TODO Nginx server does't make redirect after installation (random fail)
59
- $ this ->installPage = $ installPage ;
60
- $ this ->waitSuccessPage ();
61
58
$ adminData = $ installPage ->getInstallBlock ()->getAdminInfo ();
62
59
$ dbData = $ installPage ->getInstallBlock ()->getDbInfo ();
63
60
@@ -70,6 +67,12 @@ public function processAssert(Install $installPage, InstallConfig $installConfig
70
67
$ allData ['baseUrl ' ] = (isset ($ allData ['https ' ]) ? $ allData ['https ' ] : $ allData ['baseUrl ' ]);
71
68
$ allData ['admin ' ] = $ allData ['baseUrl ' ] . $ allData ['admin ' ] . '/ ' ;
72
69
70
+ //TODO Nginx server does't make redirect after installation (random fail)
71
+ sleep (5 );
72
+ if ($ installPage ->getInstallBlock ()->isInstallationCompleted ()) {
73
+ return ;
74
+ }
75
+
73
76
foreach ($ this ->adminFieldsList as $ field ) {
74
77
\PHPUnit_Framework_Assert::assertEquals (
75
78
$ allData [$ field ['fixture ' ]],
@@ -86,19 +89,6 @@ public function processAssert(Install $installPage, InstallConfig $installConfig
86
89
}
87
90
}
88
91
89
- /**
90
- * Wait for success install page.
91
- *
92
- * @return void
93
- */
94
- private function waitSuccessPage ()
95
- {
96
- sleep (5 );
97
- if ($ this ->installPage ->getInstallBlock ()->isInstallationCompleted ()) {
98
- $ this ->installPage ->open ();
99
- }
100
- }
101
-
102
92
/**
103
93
* Returns a string representation of successful assertion.
104
94
*
0 commit comments