fix json format in tests for set team with new auth providers
@@ -545,14 +545,15 @@ var _ = Describe("Fly CLI", func() {
"basic_auth_username": "brock obama",
"basic_auth_password": "brock123"
},
- "github_auth": {
+ "auth": {
+ "github": {
"client_id": "barack samson",
"client_secret": "barack123",
"organizations": ["Obama, Inc", "Samson, Inc"],
"teams": [{"organization_name": "Venture, Inc", "team_name": "venture-devs"}],
"users": ["lisa", "frank"]
},
- "uaa_auth": {
+ "uaa": {
"client_id": "barack samson",
"client_secret": "barack123",
"auth_url": "http://uaa.auth.url",
@@ -561,6 +562,7 @@ var _ = Describe("Fly CLI", func() {
"cf_url": "http://cf.url",
"cf_ca_cert": "cf-cert-contents"
}
+ }
}`),
ghttp.RespondWithJSONEncoded(http.StatusCreated, atc.Team{
Name: "venture",
@@ -660,7 +662,8 @@ var _ = Describe("Fly CLI", func() {
"basic_auth_username": "brock obama",
"basic_auth_password": "brock123"
},
- "github_auth": {
+ "auth": {
+ "github": {
"client_id": "barack samson",
"client_secret": "barack123",
"organizations": ["Obama, Inc", "Samson, Inc"],
@@ -670,15 +673,7 @@ var _ = Describe("Fly CLI", func() {
"token_url": "http://enterprise.github.com/token",
"api_url": "http://enterprise.github.com/api"
},
- "uaa_auth": {
- "client_id": "barack samson",
- "client_secret": "barack123",
- "auth_url": "http://uaa.auth.url",
- "token_url": "http://uaa.token.url",
- "cf_spaces": ["Obama, Inc", "Samson, Inc"],
- "cf_url": "http://cf.url"
- },
- "genericoauth_auth": {
+ "oauth": {
"display_name": "generic cool name",
"client_id": "barack samson",
"client_secret": "barack123",
@@ -688,6 +683,15 @@ var _ = Describe("Fly CLI", func() {
"param2": "value2"
},
"token_url": "http://goa.token.url"
+ },
+ "uaa": {
+ "client_id": "barack samson",
+ "client_secret": "barack123",
+ "auth_url": "http://uaa.auth.url",
+ "token_url": "http://uaa.token.url",
+ "cf_spaces": ["Obama, Inc", "Samson, Inc"],
+ "cf_url": "http://cf.url"
+ }
}
}`),
ghttp.RespondWithJSONEncoded(http.StatusCreated, atc.Team{
