Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ script: bin/test --compilers=2
branches:
only:
- master
- /^hw-issue-.*$/
- /^hwcf-issue-.*$/
before_install:
- repo=`basename $PWD`; localDir=`dirname $PWD`; cfDir="`dirname $localDir`/cloudfoundry"
- if [[ "$localDir" != "$cfDir" ]]; then mv "$localDir" "$cfDir"; cd ../../cloudfoundry/$repo; export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$repo; fi
5 changes: 0 additions & 5 deletions cf/api/organizations/organizations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ var _ = Describe("Organization Repository", func() {

Describe("getting OrgRoles", func() {
It("getting Orgs with a manager role", func() {

req := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/organizations?q=manager_guid:my-user-guid;q=name:Org1",
Expand All @@ -105,12 +104,10 @@ var _ = Describe("Organization Repository", func() {
org, apiErr := repo.GetOrgRoleForUser("manager_guid", "Org1")
Expect(handler).To(HaveAllRequestsCalled())
Expect(apiErr).NotTo(HaveOccurred())

Expect(org.Name).To(Equal(existingOrg.Name))
})

It("getting Orgs with a billing manager role", func() {

req := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/organizations?q=billing_manager_guid:my-user-guid;q=name:Org1",
Expand All @@ -133,11 +130,9 @@ var _ = Describe("Organization Repository", func() {
Expect(handler).To(HaveAllRequestsCalled())
Expect(apiErr).NotTo(HaveOccurred())
Expect(org.Name).To(Equal(existingOrg.Name))

})

It("checking for apiErr", func() {

req := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/organizations?q=apiErr:my-user-guid;q=name:Org1",
Expand Down
4 changes: 0 additions & 4 deletions cf/api/spaces/spaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ var _ = Describe("Space Repository", func() {

Describe("finding spaces by role", func() {
It("returns the space with developer role", func() {

pageSpacesRequest := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/spaces?q=developer_guid:my-user-guid;q=name:my-space",
Expand Down Expand Up @@ -135,7 +134,6 @@ var _ = Describe("Space Repository", func() {
})

It("returns the space with manager role", func() {

pageSpacesRequest := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/users/my-user-guid/managed_spaces?q=organization_guid:my-org-guid;q=name:my-space",
Expand Down Expand Up @@ -181,7 +179,6 @@ var _ = Describe("Space Repository", func() {
})

It("returns the apiErr while fetching space role", func() {

pageSpacesRequest := testapi.NewCloudControllerTestRequest(testnet.TestRequest{
Method: "GET",
Path: "/v2/users/my-user-guid/managed_spaces?q=organization_guid:my-org-guid;q=name:my-space",
Expand All @@ -207,7 +204,6 @@ var _ = Describe("Space Repository", func() {
Expect(apiErr).To(HaveOccurred())
Expect(handler).To(HaveAllRequestsCalled())
})

})

Describe("finding spaces by name", func() {
Expand Down
9 changes: 0 additions & 9 deletions cf/commands/user/user-info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,13 @@ var _ = Describe("user-info command", func() {
requirementsFactory.Organization = org

configRepo = testconfig.NewRepositoryWithAccessToken(core_config.TokenInfo{Username: "user1"})

configRepo.SetOrganizationFields(models.OrganizationFields{
Name: "Org1",
Guid: "org1-guid",
})
})

It("shows the roles for orgs when only Org is targeted", func() {

orgRepo.ListOfRolesOfAnOrg = map[string]string{
"manager_guid": "Org1",
"billing_manager_guid": "Org1",
Expand All @@ -97,7 +95,6 @@ var _ = Describe("user-info command", func() {
})

It("shows the roles when proper org and space is targeted", func() {

orgRepo.ListOfRolesOfAnOrg = map[string]string{
"manager_guid": "Org1",
"billing_manager_guid": "Org1",
Expand All @@ -113,15 +110,13 @@ var _ = Describe("user-info command", func() {
space := models.Space{}
space.Name = "Space1"
space.Guid = "space1-guid"

spaceRepo.FindByNameInOrgSpace = space
requirementsFactory.Space = space

configRepo.SetSpaceFields(models.SpaceFields{
Name: "Space1",
Guid: "space1-guid",
})

runCommand()

Expect(ui.Outputs).To(ContainSubstrings(
Expand All @@ -132,7 +127,6 @@ var _ = Describe("user-info command", func() {
})

It("should fail when QueryParam is wrong", func() {

orgRepo.ListOfRolesOfAnOrg = map[string]string{
"apiErrorCheck1": "Org1",
"apiErrorCheck12": "Org1",
Expand All @@ -145,9 +139,6 @@ var _ = Describe("user-info command", func() {
[]string{"Failed"},
[]string{"query param not found"},
))

})

})

})
8 changes: 4 additions & 4 deletions cf/i18n/resources/fr_FR.all.json
Original file line number Diff line number Diff line change
Expand Up @@ -5156,7 +5156,7 @@
},
{
"id": "Show user-info with roles",
"translation": "Show user-info with roles",
"translation": "Montrer user-info avec ces roles",
"modified": false
},
{
Expand All @@ -5166,17 +5166,17 @@
},
{
"id": "Getting user information...",
"translation": "Getting user information...",
"translation": "En trains d'obtenir information pour l'utilisateur courrant...",
"modified": false
},
{
"id": "User",
"translation": "User",
"translation": "Utilisateur",
"modified": false
},
{
"id": "Role",
"translation": "Role",
"translation": "Rôle",
"modified": false
}
]