From 8f91426e0af32aa4007d9f3b4749a78261a44279 Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Wed, 7 Oct 2015 11:09:01 +0000 Subject: [PATCH] changing indentation, vertical elements and previous existance of users and groups --- .../features/bootstrap/FeatureContext.php | 38 +++++++++---------- .../features/provisioning-v1.feature | 12 ++++-- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php index 70424b1d24..f440aece60 100644 --- a/build/integration/features/bootstrap/FeatureContext.php +++ b/build/integration/features/bootstrap/FeatureContext.php @@ -58,22 +58,22 @@ class FeatureContext extends BehatContext { } /** - * Parses the xml answer to get the array of users returned. - */ - public function getArrayOfUsersResponded($resp) { - $listCheckedElements = $resp->xml()->data[0]->users[0]->element; - $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1); - return $extractedElementsArray; - } + * Parses the xml answer to get the array of users returned. + */ + public function getArrayOfUsersResponded($resp) { + $listCheckedElements = $resp->xml()->data[0]->users[0]->element; + $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1); + return $extractedElementsArray; + } - /** - * Parses the xml answer to get the array of groups returned. - */ - public function getArrayOfGroupsResponded($resp) { - $listCheckedElements = $resp->xml()->data[0]->groups[0]->element; - $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1); - return $extractedElementsArray; - } + /** + * Parses the xml answer to get the array of groups returned. + */ + public function getArrayOfGroupsResponded($resp) { + $listCheckedElements = $resp->xml()->data[0]->groups[0]->element; + $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1); + return $extractedElementsArray; + } /** * @Then /^users returned are$/ @@ -82,8 +82,8 @@ class FeatureContext extends BehatContext { public function theUsersShouldBe($usersList) { if ($usersList instanceof \Behat\Gherkin\Node\TableNode) { $users = $usersList->getRows()[0]; - $respondedArray = $this->getArrayOfUsersResponded($this->response); - PHPUnit_Framework_Assert::assertEquals(asort($users), asort($respondedArray)); + $respondedArray = $this->getArrayOfUsersResponded($this->response); + PHPUnit_Framework_Assert::assertEquals(asort($users), asort($respondedArray)); } } @@ -95,8 +95,8 @@ class FeatureContext extends BehatContext { public function theGroupsShouldBe($groupsList) { if ($groupsList instanceof \Behat\Gherkin\Node\TableNode) { $groups = $groupsList->getRows()[0]; - $respondedArray = $this->getArrayOfGroupsResponded($this->response); - PHPUnit_Framework_Assert::assertEquals(asort($groups), asort($respondedArray)); + $respondedArray = $this->getArrayOfGroupsResponded($this->response); + PHPUnit_Framework_Assert::assertEquals(asort($groups), asort($respondedArray)); } } diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index ad6841142a..d865ee687e 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -42,9 +42,12 @@ Feature: provisioning Scenario: Getting all users Given As an "admin" + And user "brand-new-user" exists + And user "admin" exists When sending "GET" to "/cloud/users" And users returned are - | brand-new-user | admin | + | brand-new-user | + | admin | Scenario: Edit a user @@ -81,11 +84,14 @@ Feature: provisioning And group "new-group" exists - Scenario: Getting all users + Scenario: Getting all groups Given As an "admin" + And group "new-group" exists + And group "admin" exists When sending "GET" to "/cloud/groups" And groups returned are - | admin | new-group | + | admin | + | new-group | Scenario: Delete a group