From 90e9b7985159189effe23c9e276a3b74075ea866 Mon Sep 17 00:00:00 2001 From: asifhuawei Date: Tue, 28 Apr 2015 08:14:44 -0400 Subject: [PATCH] Updating the french transaltion --- .travis.yml | 5 +++++ cf/api/organizations/organizations_test.go | 5 ----- cf/api/spaces/spaces_test.go | 4 ---- cf/commands/user/user-info_test.go | 9 --------- cf/i18n/resources/fr_FR.all.json | 8 ++++---- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 438376f8c09..9eb35ebcdaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/cf/api/organizations/organizations_test.go b/cf/api/organizations/organizations_test.go index 2225c57ed6a..cd7882a4acd 100644 --- a/cf/api/organizations/organizations_test.go +++ b/cf/api/organizations/organizations_test.go @@ -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", @@ -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", @@ -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", diff --git a/cf/api/spaces/spaces_test.go b/cf/api/spaces/spaces_test.go index 82c810604a3..47dbfe16273 100644 --- a/cf/api/spaces/spaces_test.go +++ b/cf/api/spaces/spaces_test.go @@ -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", @@ -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", @@ -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", @@ -207,7 +204,6 @@ var _ = Describe("Space Repository", func() { Expect(apiErr).To(HaveOccurred()) Expect(handler).To(HaveAllRequestsCalled()) }) - }) Describe("finding spaces by name", func() { diff --git a/cf/commands/user/user-info_test.go b/cf/commands/user/user-info_test.go index 87d38e5fe7e..63a000e1556 100644 --- a/cf/commands/user/user-info_test.go +++ b/cf/commands/user/user-info_test.go @@ -72,7 +72,6 @@ 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", @@ -80,7 +79,6 @@ var _ = Describe("user-info command", func() { }) It("shows the roles for orgs when only Org is targeted", func() { - orgRepo.ListOfRolesOfAnOrg = map[string]string{ "manager_guid": "Org1", "billing_manager_guid": "Org1", @@ -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", @@ -113,7 +110,6 @@ var _ = Describe("user-info command", func() { space := models.Space{} space.Name = "Space1" space.Guid = "space1-guid" - spaceRepo.FindByNameInOrgSpace = space requirementsFactory.Space = space @@ -121,7 +117,6 @@ var _ = Describe("user-info command", func() { Name: "Space1", Guid: "space1-guid", }) - runCommand() Expect(ui.Outputs).To(ContainSubstrings( @@ -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", @@ -145,9 +139,6 @@ var _ = Describe("user-info command", func() { []string{"Failed"}, []string{"query param not found"}, )) - }) - }) - }) diff --git a/cf/i18n/resources/fr_FR.all.json b/cf/i18n/resources/fr_FR.all.json index 99b23ecfe45..2a28ede0a8e 100644 --- a/cf/i18n/resources/fr_FR.all.json +++ b/cf/i18n/resources/fr_FR.all.json @@ -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 }, { @@ -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 } ] \ No newline at end of file