Fix values implementation manipulation

tbolier · Sep 8, 2018 · 08d4b83 · 08d4b83
1 parent f568cf9
commit 08d4b83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/Query/Manipulation/ManipulationTrait.php b/src/Query/Manipulation/ManipulationTrait.php
@@ -22,7 +22,7 @@ public function keys(): Keys
         return new Keys($this->rethink, /** @scrutinizer ignore-type */ $this);
     }
 
-    public function values(): QueryInterface
+    public function values(): Values
     {
         return new Values($this->rethink, /** @scrutinizer ignore-type */ $this);
     }

diff --git a/src/Query/Manipulation/Values.php b/src/Query/Manipulation/Values.php
@@ -41,7 +41,9 @@ public function toArray(): array
     {
         return [
             TermType::VALUES,
-            $this->query->toArray(),
+            [
+                $this->query->toArray()
+            ],
         ];
     }
 }
diff --git a/test/integration/Manipulation/ValuesTest.php b/test/integration/Manipulation/ValuesTest.php
@@ -4,6 +4,7 @@
 namespace TBolier\RethinkQL\IntegrationTest\Manipulation;
 
 use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
+use TBolier\RethinkQL\Response\ResponseInterface;
 
 class ValuesTest extends AbstractTableTest
 {
@@ -12,16 +13,17 @@ class ValuesTest extends AbstractTableTest
      */
     public function testValuesResult()
     {
-        $this->insertDocumentWithNumber(1, 1);
+        $this->insertDocumentWithNumber(1, 777);
 
-        /** @var Cursor $cursor */
-        $cursor = $this->r()
+        /** @var ResponseInterface $cursor */
+        $response = $this->r()
             ->table('tabletest')
             ->get(1)
             ->values()
             ->run();
 
-        $this->assertInstanceOf(\Iterator::class, $cursor);
-        $this->assertEquals(1, $cursor->count());
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertCount(4, $response->getData());
+        $this->assertArraySubset([2 => 777], $response->getData());
     }
 }