diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa7146bc6ee1af1da213ec0a0a411cc40d6c98d2..53c5e13fec7635484cd31b4c0d239de1b9ca51d1 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ services: - name: postgres:10.1 - command: ["postgres", "-c", "datestyle='iso,dmy'"] + command: ["-c", "datestyle=\'iso,dmy\'"] - httpd:latest variables: diff --git a/test/unitTests/app/notification/DiffusionTypesControllerTest.php b/test/unitTests/app/notification/DiffusionTypesControllerTest.php index d1d801a82a3bffce16029767291203cd9286839e..15143e8c003d322fbc9539c80448d88fb6598cfe 100755 --- a/test/unitTests/app/notification/DiffusionTypesControllerTest.php +++ b/test/unitTests/app/notification/DiffusionTypesControllerTest.php @@ -184,7 +184,7 @@ class DiffusionTypesControllerTest extends TestCase $args['event']['table_name'] = 'notes'; $args['event']['record_id'] = 1; $response = $diffusionTypesController->getItemsToNotify($args); - $this->assertEmpty($response); + $this->assertIsInt($response); $args['event']['table_name'] = 'listinstance'; $args['event']['user_id'] = 19; @@ -235,7 +235,7 @@ class DiffusionTypesControllerTest extends TestCase $args['event']['table_name'] = 'notes'; $args['event']['record_id'] = 1; $response = $diffusionTypesController->getItemsToNotify($args); - $this->assertEmpty($response); + $this->assertIsInt($response); $args['event']['table_name'] = 'listinstance'; $args['event']['user_id'] = 19; @@ -294,7 +294,7 @@ class DiffusionTypesControllerTest extends TestCase $args['event']['table_name'] = 'notes'; $args['event']['record_id'] = 1; $response = $diffusionTypesController->getItemsToNotify($args); - $this->assertEmpty($response); + $this->assertIsInt($response); $args['event']['table_name'] = 'listinstance'; $args['event']['user_id'] = 19; @@ -353,7 +353,7 @@ class DiffusionTypesControllerTest extends TestCase $args['event']['table_name'] = 'notes'; $args['event']['record_id'] = 1; $response = $diffusionTypesController->getItemsToNotify($args); - $this->assertEmpty($response); + $this->assertIsInt($response); $args['event']['table_name'] = 'listinstance'; $args['event']['user_id'] = 19;