Moving increments tests for #97

Author: jenssegers

src/Jenssegers/Mongodb/Query/Builder.php

@@ -396,10 +396,12 @@ public function increment($column, $amount = 1, array $extra = array())
         $query = array(
             '$inc' => array($column => $amount)
         );
-        if(!empty($extra))
+
+        if (!empty($extra))
         {
             $query['$set'] = $extra;
         }
+
         // Protect
         $this->whereNotNull($column);
 

tests/QueryBuilderTest.php

@@ -506,4 +506,53 @@ public function testOperators()
 		$this->assertEquals(2, count($results));
 	}
 
+	public function testIncrement()
+	{
+		DB::collection('users')->insert(array(
+			array('name' => 'John Doe', 'age' => 30, 'note' => 'adult'),
+			array('name' => 'Jane Doe', 'age' => 10, 'note' => 'minor'),
+			array('name' => 'Robert Roe', 'age' => null),
+			array('name' => 'Mark Moe'),
+		));
+
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(30, $user['age']);
+
+		DB::collection('users')->where('name', 'John Doe')->increment('age');
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(31, $user['age']);
+
+		DB::collection('users')->where('name', 'John Doe')->decrement('age');
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(30, $user['age']);
+
+		DB::collection('users')->where('name', 'John Doe')->increment('age', 5);
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(35, $user['age']);
+
+		DB::collection('users')->where('name', 'John Doe')->decrement('age', 5);
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(30, $user['age']);
+
+		DB::collection('users')->where('name', 'Jane Doe')->increment('age', 10, array('note' => 'adult'));
+		$user = DB::collection('users')->where('name', 'Jane Doe')->first();
+		$this->assertEquals(20, $user['age']);
+		$this->assertEquals('adult', $user['note']);
+
+		DB::collection('users')->where('name', 'John Doe')->decrement('age', 20, array('note' => 'minor'));
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(10, $user['age']);
+		$this->assertEquals('minor', $user['note']);
+
+		DB::collection('users')->increment('age');
+		$user = DB::collection('users')->where('name', 'John Doe')->first();
+		$this->assertEquals(11, $user['age']);
+		$user = DB::collection('users')->where('name', 'Jane Doe')->first();
+		$this->assertEquals(21, $user['age']);
+		$user = DB::collection('users')->where('name', 'Robert Roe')->first();
+		$this->assertEquals(null, $user['age']);
+		$user = DB::collection('users')->where('name', 'Mark Moe')->first();
+		$this->assertFalse(isset($user['age']));
+	}
+
 }

tests/QueryTest.php

@@ -149,37 +149,6 @@ public function testOrder()
 		$this->assertEquals(37, $user->age);
 	}
 
-	public function testIncrements()
-	{
-		User::where('name', 'John Doe')->increment('age');
-		User::where('name', 'John Doe')->increment('age', 2, array('title' => 'user'));
-
-		$user = User::where('name', 'John Doe')->first();
-		$this->assertEquals(38, $user->age);
-		$this->assertEquals('user', $user->title);
-
-		User::where('name', 'John Doe')->decrement('age');
-		$num = User::where('name', 'John Doe')->decrement('age', 2, array('title' => 'admin'));
-
-		$user = User::where('name', 'John Doe')->first();
-		$this->assertEquals(35, $user->age);
-		$this->assertEquals('admin', $user->title);
-		$this->assertEquals(1, $num);
-
-		User::increment('age');
-		User::increment('age', 2);
-
-		$user = User::where('name', 'Mark Moe')->first();
-		$this->assertEquals(26, $user->age);
-
-		User::decrement('age', 2);
-		$num = User::decrement('age');
-
-		$user = User::where('name', 'Mark Moe')->first();
-		$this->assertEquals(23, $user->age);
-		$this->assertEquals(8, $num);
-	}
-
 	public function testGroupBy()
 	{
 		$users = User::groupBy('title')->get();