Refine unit tests

GlotPress · Nov 29, 2016 · 7c34167 · 7c34167
1 parent 36f9d25
commit 7c34167
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/gp-includes/advanced-permissions.php b/gp-includes/advanced-permissions.php
@@ -62,8 +62,6 @@ function gp_allow_approve_translation_with_validator_permissions( $verdict, $arg
 
 		if ( isset( $args['extra']['translation']->translation_set_id ) ) {
 			$args['object_id'] = $args['extra']['translation']->translation_set_id;
-		} elseif ( isset( $args['extra']['set']->id ) ) {
-			$args['object_id'] = $args['extra']['set']->id;
 		} else {
 			return $verdict;
 		}

diff --git a/tests/phpunit/testcases/tests_things/test_thing_translation.php b/tests/phpunit/testcases/tests_things/test_thing_translation.php
@@ -57,11 +57,6 @@ function test_translation_denied_approve_change_status() {
 		$this->assertEquals( 0, $set->current_count() );
 		$this->assertEquals( 1, count( $waiting_translations ) );
 		$this->assertEquals( 1, $set->waiting_count() );
-
-		$for_translation = GP::$translation->for_translation( $set->project, $set, 0, array( 'status' => 'current' ) );
-
-		$this->assertEquals( 0, count( $for_translation ) );
-		$this->assertEquals( 0, $set->current_count() );
 	}
 
 	function test_translation_should_support_6_plurals() {
@@ -243,8 +238,11 @@ function test_validator_id_saved_on_status_change_to_current() {
 		$user = $this->factory->user->create();
 		wp_set_current_user( $user );
 
-		GP::$validator_permission->create( array( 'user_id' => $user, 'action' => 'approve',
-		                                          'project_id' => $set->project_id, 'locale_slug' => $set->locale, 'set_slug' => $set->slug ) );
+		GP::$validator_permission->create( array(
+			'user_id' => $user, 'action' => 'approve',
+			'project_id' => $set->project_id, 'locale_slug' => $set->locale,
+			'set_slug' => $set->slug,
+		) );
 
 		$translation->set_as_current();
 		$this->assertEquals( $user, $translation->user_id_last_modified );
@@ -253,16 +251,43 @@ function test_validator_id_saved_on_status_change_to_current() {
 	function test_validator_id_saved_on_status_change_to_rejected() {
 		$set = $this->factory->translation_set->create_with_project_and_locale();
 		$translation = $this->factory->translation->create_with_original_for_translation_set( $set );
-		$translation->set_status('waiting');
+		$translation->set_status( 'waiting' );
 
 		$user = $this->factory->user->create();
 		wp_set_current_user( $user );
 
-		GP::$validator_permission->create( array( 'user_id' => $user, 'action' => 'approve',
-		                                          'project_id' => $set->project_id, 'locale_slug' => $set->locale, 'set_slug' => $set->slug ) );
+		GP::$validator_permission->create( array(
+			'user_id' => $user, 'action' => 'approve',
+			'project_id' => $set->project_id, 'locale_slug' => $set->locale,
+			'set_slug' => $set->slug,
+		) );
 
-		$translation->set_status('rejected');
+		$translation->set_status( 'rejected' );
 		$this->assertEquals( $user, $translation->user_id_last_modified );
 	}
 
+	function test_cannot_reject_translation_without_approve_permission() {
+		$set = $this->factory->translation_set->create_with_project_and_locale();
+		$translation = $this->factory->translation->create_with_original_for_translation_set( $set );
+		$this->assertTrue( $translation->set_status( 'waiting' ) );
+
+		$user = $this->factory->user->create();
+		wp_set_current_user( $user );
+
+		$this->assertFalse( $translation->set_status( 'rejected' ) );
+		$this->assertNotEquals( $user, $translation->user_id_last_modified );
+	}
+
+	function test_cannot_approve_translation_without_approve_permission() {
+		$set = $this->factory->translation_set->create_with_project_and_locale();
+		$translation = $this->factory->translation->create_with_original_for_translation_set( $set );
+		$this->assertTrue( $translation->set_status( 'waiting' ) );
+
+		$user = $this->factory->user->create();
+		wp_set_current_user( $user );
+
+		$this->assertFalse( $translation->set_status( 'current' ) );
+		$this->assertNotEquals( $user, $translation->user_id_last_modified );
+	}
+
 }