Move setup config outside setupAdmin

If user doesn't want to create a new admin (even if it's recommended) the internal config weren't created resulting in error when using the interface.
author: Jeremy Benoist <jeremy.benoist@gmail.com> 2016-04-11 19:37:29 +0200
committer: Jeremy Benoist <jeremy.benoist@gmail.com> 2016-04-11 19:37:29 +0200
commit: 637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8 (patch)
tree: df86ecf2e2faf6340094ce23945d72813469f55c /src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
parent: a83fbf4504f08612020792bd454bf1c881fb3c14 (diff)
download: wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.tar.gz
wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.tar.zst
wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.zip
1 files changed, 30 insertions, 24 deletions
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
index bb8fb888..bd61f750 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
@@ -67,10 +67,11 @@ class InstallCommandTest extends WallabagCoreTestCase
            'command' => $command->getName(),
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
    }
    public function testRunInstallCommandWithReset()
@@ -97,11 +98,12 @@ class InstallCommandTest extends WallabagCoreTestCase
            '--reset' => true,
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
        $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
        // we force to reset everything
        $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
@@ -142,10 +144,11 @@ class InstallCommandTest extends WallabagCoreTestCase
            'command' => $command->getName(),
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
        // the current database doesn't already exist
        $this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay());
@@ -179,10 +182,11 @@ class InstallCommandTest extends WallabagCoreTestCase
            'command' => $command->getName(),
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
        $this->assertContains('Droping schema and creating schema', $tester->getDisplay());
    }
@@ -233,10 +237,11 @@ class InstallCommandTest extends WallabagCoreTestCase
            'command' => $command->getName(),
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
        $this->assertContains('Creating schema', $tester->getDisplay());
    }
@@ -265,9 +270,10 @@ class InstallCommandTest extends WallabagCoreTestCase
            '--no-interaction' => true,
        ));
-        $this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());
+        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());
+        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());
+        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
+        $this->assertContains('Config setup.', $tester->getDisplay());
+        $this->assertContains('Installing assets.', $tester->getDisplay());
    }
 }
author	Jeremy Benoist <jeremy.benoist@gmail.com>	2016-04-11 19:37:29 +0200
committer	Jeremy Benoist <jeremy.benoist@gmail.com>	2016-04-11 19:37:29 +0200
commit	637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8 (patch)
tree	df86ecf2e2faf6340094ce23945d72813469f55c /src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
parent	a83fbf4504f08612020792bd454bf1c881fb3c14 (diff)
download	wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.tar.gz wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.tar.zst wallabag-637dc4bb21edf8f3b0b0926aa50fa5ffdf362db8.zip

diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php index bb8fb888..bd61f750 100644 --- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php +++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
@@ -67,10 +67,11 @@ class InstallCommandTest extends WallabagCoreTestCase
67	'command' => $command->getName(),	67	'command' => $command->getName(),
68	));	68	));
69		69
70	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	70	$this->assertContains('Checking system requirements.', $tester->getDisplay());
71	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	71	$this->assertContains('Setting up database.', $tester->getDisplay());
72	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	72	$this->assertContains('Administration setup.', $tester->getDisplay());
73	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	73	$this->assertContains('Config setup.', $tester->getDisplay());
		74	$this->assertContains('Installing assets.', $tester->getDisplay());
74	}	75	}
75		76
76	public function testRunInstallCommandWithReset()	77	public function testRunInstallCommandWithReset()
@@ -97,11 +98,12 @@ class InstallCommandTest extends WallabagCoreTestCase
97	'--reset' => true,	98	'--reset' => true,
98	));	99	));
99		100
100	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	101	$this->assertContains('Checking system requirements.', $tester->getDisplay());
101	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	102	$this->assertContains('Setting up database.', $tester->getDisplay());
102	$this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());	103	$this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
103	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	104	$this->assertContains('Administration setup.', $tester->getDisplay());
104	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	105	$this->assertContains('Config setup.', $tester->getDisplay());
		106	$this->assertContains('Installing assets.', $tester->getDisplay());
105		107
106	// we force to reset everything	108	// we force to reset everything
107	$this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());	109	$this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
@@ -142,10 +144,11 @@ class InstallCommandTest extends WallabagCoreTestCase
142	'command' => $command->getName(),	144	'command' => $command->getName(),
143	));	145	));
144		146
145	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	147	$this->assertContains('Checking system requirements.', $tester->getDisplay());
146	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	148	$this->assertContains('Setting up database.', $tester->getDisplay());
147	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	149	$this->assertContains('Administration setup.', $tester->getDisplay());
148	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	150	$this->assertContains('Config setup.', $tester->getDisplay());
		151	$this->assertContains('Installing assets.', $tester->getDisplay());
149		152
150	// the current database doesn't already exist	153	// the current database doesn't already exist
151	$this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay());	154	$this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay());
@@ -179,10 +182,11 @@ class InstallCommandTest extends WallabagCoreTestCase
179	'command' => $command->getName(),	182	'command' => $command->getName(),
180	));	183	));
181		184
182	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	185	$this->assertContains('Checking system requirements.', $tester->getDisplay());
183	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	186	$this->assertContains('Setting up database.', $tester->getDisplay());
184	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	187	$this->assertContains('Administration setup.', $tester->getDisplay());
185	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	188	$this->assertContains('Config setup.', $tester->getDisplay());
		189	$this->assertContains('Installing assets.', $tester->getDisplay());
186		190
187	$this->assertContains('Droping schema and creating schema', $tester->getDisplay());	191	$this->assertContains('Droping schema and creating schema', $tester->getDisplay());
188	}	192	}
@@ -233,10 +237,11 @@ class InstallCommandTest extends WallabagCoreTestCase
233	'command' => $command->getName(),	237	'command' => $command->getName(),
234	));	238	));
235		239
236	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	240	$this->assertContains('Checking system requirements.', $tester->getDisplay());
237	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	241	$this->assertContains('Setting up database.', $tester->getDisplay());
238	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	242	$this->assertContains('Administration setup.', $tester->getDisplay());
239	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	243	$this->assertContains('Config setup.', $tester->getDisplay());
		244	$this->assertContains('Installing assets.', $tester->getDisplay());
240		245
241	$this->assertContains('Creating schema', $tester->getDisplay());	246	$this->assertContains('Creating schema', $tester->getDisplay());
242	}	247	}
@@ -265,9 +270,10 @@ class InstallCommandTest extends WallabagCoreTestCase
265	'--no-interaction' => true,	270	'--no-interaction' => true,
266	));	271	));
267		272
268	$this->assertContains('Step 1 of 4. Checking system requirements.', $tester->getDisplay());	273	$this->assertContains('Checking system requirements.', $tester->getDisplay());
269	$this->assertContains('Step 2 of 4. Setting up database.', $tester->getDisplay());	274	$this->assertContains('Setting up database.', $tester->getDisplay());
270	$this->assertContains('Step 3 of 4. Administration setup.', $tester->getDisplay());	275	$this->assertContains('Administration setup.', $tester->getDisplay());
271	$this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());	276	$this->assertContains('Config setup.', $tester->getDisplay());
		277	$this->assertContains('Installing assets.', $tester->getDisplay());
272	}	278	}
273	}	279	}