Merge pull request #164 from silinternational/release/5.1.1

Release 5.1.1

Makefile

@@ -24,6 +24,7 @@ behatappend:
 
 broker:
 	docker-compose up -d brokerdb brokercron broker
+	make wait_for_broker
 
 clean:
 	docker-compose kill
@@ -33,7 +34,7 @@ deps:
 	docker-compose run --rm cli composer install --no-scripts
 
 composershow:
-	docker-compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq ".locked[] | { \"name\": .name, \"version\": .version }" > dependencies.json'
+	docker-compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
 
 depsupdate:
 	docker-compose run --rm cli bash -c "composer update --no-scripts"
@@ -47,11 +48,13 @@ psr2:
 
 # NOTE: When running tests locally, make sure you don't exclude the integration
 #       tests (which we do when testing on Codeship).
-test: deps unittest broker
-	sleep 15 && make behat
+test: deps unittest broker behat
 
 testci: deps broker
 	docker-compose run --rm cli bash -c "./run-tests.sh"
 
 unittest:
 	docker-compose run --rm cli vendor/bin/phpunit
+
+wait_for_broker:
+	docker-compose run --rm cli whenavail broker 80 20 echo "Broker is ready"

README.md

@@ -6,15 +6,16 @@ Copy ```local.env.dist``` to ```local.env``` and supply any necessary values.
 
 ## Testing
 
-Many of the tests depend on other containers. Before running any tests, build the full development environment using
-`make start` before running tests.
-
 ### Run all except integration tests
 
 Run `make testci`
 
 ### Run a single test suite
 
+**Note:** Before running an individual test, you might need to bring up various other containers
+needed (like "broker"), depending on which test you will run. An easy way to do that is to simply
+run `make testci` first, then use one of the following to run just a specific test.
+
 - `make bash`
 - `vendor/bin/behat --config=features/behat.yml --suite=notification_features`
 

application/common/components/adapters/IdpIdBroker.php

@@ -147,7 +147,8 @@ public function listUsers($fields = null): array
             $message = 'ID Broker returned non-OK status ' . $e->httpStatusCode;
             throw new Exception($message, $e->getCode(), $e);
         } catch (Exception $e) {
-            throw new Exception('error getting users list from ID Broker: ' . $e->getMessage(), $e);
+            $message = 'error getting users list from ID Broker: ' . $e->getMessage();
+            throw new Exception($message, $e->getCode(), $e);
         }
 
         return self::getAsUsers($result);

application/common/config/main.php

@@ -131,7 +131,7 @@
                     'clientOptions' => [
                         'attach_stacktrace' => false, // stack trace identifies the logger call stack, not helpful
                         'environment' => YII_ENV,
-                        'release' => '[email protected].0',
+                        'release' => '[email protected].1',
                         'before_send' => function (Event $event) use ($idpName): ?Event {
                             $event->setExtra(['idp' => $idpName]);
                             return $event;