Or I finish my sente...

Firesphere · Feb 22, 2018 · 6ee7276 · 6ee7276
1 parent e4f53a9
commit 6ee7276
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/tasks/SeederTask.php b/src/tasks/SeederTask.php
@@ -205,8 +205,6 @@ public function parseFixture()
         $parser = new Parser();
         $fixtureContent = [];
         if ($this->fixture->getFixtureString() !== null) {
-            $fixtureContent = $parser->parse($this->fixture->getFixtureString());
-        } else {
             if (file_exists($this->fixture->getFixtureFile())) {
                 $contents = file_get_contents($this->fixture->getFixtureFile());
                 $fixtureContent = $parser->parse($contents);

diff --git a/tests/unit/SeederTaskTest.php b/tests/unit/SeederTaskTest.php
@@ -44,20 +44,21 @@ public function setUp()
 
     public function testLive()
     {
-        Dir
-        $file = Director::baseFolder() . '/.env';
-        file_put_contents($file,
-            str_replace('dev', 'live', file_get_contents($file)));
+        /** @var Kernel $kernel */
+        $kernel = Injector::inst()->get(Kernel::class);
+        $kernel->setEnvironment(Kernel::LIVE);
+
         ob_start();
 
-        $request = new HTTPRequest('GET', '', ['type' => '']);
+        $request = new HTTPRequest('GET', '', ['type' => 'seed']);
         $this->seeder->run($request);
 
         $result = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertContains('DO NOT RUN ME ON LIVE', $result);
+        $kernel->setEnvironment(Kernel::DEV);
     }
 
     public function testRun()