Merge pull request #136 from DonCallisto/queue_ordering

Issue #135 fix

src/Process/ProcessesManager.php

@@ -53,7 +53,7 @@ public function assertNProcessRunning(QueueInterface &$queue, Processes &$proces
 
             $currentProcessNumber = $this->getCurrentProcessCounter();
             $this->incrementForThisChannel($currentChannel);
-            $process = $this->processFactory->createAProcess($queue->pop(), $currentChannel, $currentProcessNumber, $this->isFirstForThisChannel($currentChannel));
+            $process = $this->processFactory->createAProcess($queue->shift(), $currentChannel, $currentProcessNumber, $this->isFirstForThisChannel($currentChannel));
             $processes->add($currentChannel, $process);
             $processes->start($currentChannel);
         }

src/Queue/Infrastructure/InMemoryQueue.php

@@ -19,6 +19,11 @@ public function pop()
         return array_pop($this->queue);
     }
 
+    public function shift()
+    {
+        return array_shift($this->queue);
+    }
+
     public function push(TestsQueue $testSuite)
     {
         $this->queue = array_merge($this->queue, $testSuite->toArray());

src/Queue/QueueInterface.php

@@ -6,9 +6,16 @@ interface QueueInterface
 {
     /**
      * @return TestSuite
+     *
+     * @deprecated Will be removed in v2
      */
     public function pop();
 
+    /**
+     * @return TestSuite
+     */
+    public function shift();
+
     /**
      * Push a collections of tests.
      *

tests/Process/ProcessesManagerTest.php

@@ -39,7 +39,7 @@ public function shouldCreateProcessesWithoutBeforeProcessExecutingFactoryWithThe
             ->method('isEmpty')
             ->willReturn(false);
         $queue->expects($this->once())
-            ->method('pop')
+            ->method('shift')
             ->willReturn(new TestSuite('path'));
 
         $processes = $this->getMockBuilder('Liuggio\Fastest\Process\Processes')
@@ -73,7 +73,7 @@ public function shouldCreate6ProcessesGivingThemTheCorrectEnvParameters()
             ->method('isEmpty')
             ->willReturn(false);
         $queue->expects($this->exactly(6))
-            ->method('pop')
+            ->method('shift')
             ->willReturn(new TestSuite('path'));
 
         $processes = $this->getMockBuilder('Liuggio\Fastest\Process\Processes')

tests/Queue/Infrastructure/InMemoryQueueTest.php

@@ -18,4 +18,17 @@ public function shouldPopAndPushASuite()
         $this->assertEquals('a', $queue->pop());
         $this->assertTrue($queue->isEmpty());
     }
+
+    /**
+     * @test
+     */
+    public function shouldPopAndShiftASuite()
+    {
+        $queue = new InMemoryQueue();
+        $tests = new TestsQueue(['a', 'b']);
+        $queue->push($tests);
+        $this->assertEquals('a', $queue->shift());
+        $this->assertEquals('b', $queue->shift());
+        $this->assertTrue($queue->isEmpty());
+    }
 }