diff --git a/env_vars_integration_test.go b/env_vars_integration_test.go index ae523e5..0a5275e 100644 --- a/env_vars_integration_test.go +++ b/env_vars_integration_test.go @@ -82,7 +82,7 @@ func TestEnvVarsService_Integration_ListByRepoSlug(t *testing.T) { func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoId(t *testing.T) { // Create - body := EnvVarBody{Name: "TEST", Value: "test", Public: true} + body := EnvVarBody{Name: "TEST", Value: "test", Public: true, Branch: "foo"} envVar, res, err := integrationClient.EnvVars.CreateByRepoId(context.TODO(), integrationRepoId, &body) if err != nil { @@ -93,7 +93,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoId(t *te t.Fatalf("EnvVars.CreateByRepoId returned invalid http status: %s", res.Status) } - if *envVar.Name != body.Name || *envVar.Value != body.Value || *envVar.Public != body.Public { + if *envVar.Name != body.Name || *envVar.Value != body.Value || *envVar.Public != body.Public || *envVar.Branch != body.Branch { t.Fatalf("EnvVars.CreateByRepoId returned invalid EnvVar: %v", envVar) } @@ -101,7 +101,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoId(t *te time.Sleep(2 * time.Second) // Update - body = EnvVarBody{Name: "NEW_TEST", Value: "new_test", Public: false} + body = EnvVarBody{Name: "NEW_TEST", Value: "new_test", Public: false, Branch: "bar"} envVar, res, err = integrationClient.EnvVars.UpdateByRepoId(context.TODO(), integrationRepoId, *envVar.Id, &body) if err != nil { @@ -112,7 +112,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoId(t *te t.Fatalf("EnvVars.UpdateByRepoId returned invalid http status: %s", res.Status) } - if *envVar.Name != body.Name || envVar.Value != nil || *envVar.Public != body.Public { + if *envVar.Name != body.Name || envVar.Value != nil || *envVar.Public != body.Public || *envVar.Branch != body.Branch { t.Fatalf("EnvVars.UpdateByRepoId returned invalid EnvVar: %v", envVar) } @@ -133,7 +133,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoId(t *te func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoSlug(t *testing.T) { // Create - body := EnvVarBody{Name: "TEST", Value: "test", Public: true} + body := EnvVarBody{Name: "TEST", Value: "test", Public: true, Branch: "foo"} envVar, res, err := integrationClient.EnvVars.CreateByRepoSlug(context.TODO(), integrationRepoSlug, &body) if err != nil { @@ -144,7 +144,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoSlug(t * t.Fatalf("EnvVars.CreateByRepoSlug returned invalid http status: %s", res.Status) } - if *envVar.Name != body.Name || *envVar.Value != body.Value || *envVar.Public != body.Public { + if *envVar.Name != body.Name || *envVar.Value != body.Value || *envVar.Public != body.Public || *envVar.Branch != body.Branch { t.Fatalf("EnvVars.CreateByRepoSlug returned invalid EnvVar: %v", envVar) } @@ -152,7 +152,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoSlug(t * time.Sleep(2 * time.Second) // Update - body = EnvVarBody{Name: "NEW_TEST", Value: "new_test", Public: false} + body = EnvVarBody{Name: "NEW_TEST", Value: "new_test", Public: false, Branch: "bar"} envVar, res, err = integrationClient.EnvVars.UpdateByRepoSlug(context.TODO(), integrationRepoSlug, *envVar.Id, &body) if err != nil { @@ -163,7 +163,7 @@ func TestEnvVarsService_Integration_CreateAndUpdateAndDeleteEnvVarByRepoSlug(t * t.Fatalf("EnvVar.UpdateByRepoSlug returned invalid http status: %s", res.Status) } - if *envVar.Name != body.Name || envVar.Value != nil || *envVar.Public != body.Public { + if *envVar.Name != body.Name || envVar.Value != nil || *envVar.Public != body.Public || *envVar.Branch != body.Branch { t.Fatalf("EnvVars.UpdateByRepoSlug returned invalid EnvVar: %v", envVar) } diff --git a/env_vars_test.go b/env_vars_test.go index 5931953..6b573e4 100644 --- a/env_vars_test.go +++ b/env_vars_test.go @@ -21,7 +21,7 @@ func TestEnvVarsService_FindByRepoId(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%d/env_var/%s", testRepoId, testEnvVarId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodGet) - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) envVar, _, err := client.EnvVars.FindByRepoId(context.Background(), testRepoId, testEnvVarId) @@ -30,7 +30,7 @@ func TestEnvVarsService_FindByRepoId(t *testing.T) { t.Errorf("EnvVars.FindByRepoId returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.FindByRepoId returned %+v, want %+v", envVar, want) } @@ -42,7 +42,7 @@ func TestEnvVarsService_FindByRepoSlug(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%s/env_var/%s", testRepoSlug, testEnvVarId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodGet) - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) envVar, _, err := client.EnvVars.FindByRepoSlug(context.Background(), testRepoSlug, testEnvVarId) @@ -51,7 +51,7 @@ func TestEnvVarsService_FindByRepoSlug(t *testing.T) { t.Errorf("EnvVar.FindByRepoSlug returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.FindByRepoSlug returned %+v, want %+v", envVar, want) } @@ -63,7 +63,7 @@ func TestEnvVarsService_ListByRepoId(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%d/env_vars", testRepoId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodGet) - fmt.Fprint(w, `{"env_vars": [{"id":"test-12345-absde","name":"TEST","value":"test","public":false}]}`) + fmt.Fprint(w, `{"env_vars": [{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}]}`) }) envVar, _, err := client.EnvVars.ListByRepoId(context.Background(), testRepoId) @@ -72,7 +72,7 @@ func TestEnvVarsService_ListByRepoId(t *testing.T) { t.Errorf("EnvVars.FindByRepoId returned error: %v", err) } - want := []*EnvVar{{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)}} + want := []*EnvVar{{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")}} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.FindByRepoId returned %+v, want %+v", envVar, want) } @@ -84,7 +84,7 @@ func TestEnvVarsService_ListByRepoSlug(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%s/env_vars", testRepoSlug), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodGet) - fmt.Fprint(w, `{"env_vars": [{"id":"test-12345-absde","name":"TEST","value":"test","public":false}]}`) + fmt.Fprint(w, `{"env_vars": [{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}]}`) }) envVar, _, err := client.EnvVars.ListByRepoSlug(context.Background(), testRepoSlug) @@ -93,7 +93,7 @@ func TestEnvVarsService_ListByRepoSlug(t *testing.T) { t.Errorf("EnvVars.FindByRepoSlug returned error: %v", err) } - want := []*EnvVar{{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)}} + want := []*EnvVar{{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")}} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.FindByRepoSlug returned %+v, want %+v", envVar, want) } @@ -105,18 +105,18 @@ func TestEnvVarsService_CreateByRepoId(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%d/env_vars", testRepoId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodPost) - testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false}`+"\n") - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false,"env_var.branch":"foo"}`+"\n") + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) - opt := EnvVarBody{Name: "TEST", Value: "test", Public: false} + opt := EnvVarBody{Name: "TEST", Value: "test", Public: false, Branch: "foo"} envVar, _, err := client.EnvVars.CreateByRepoId(context.Background(), testRepoId, &opt) if err != nil { t.Errorf("EnvVars.CreateByRepoId returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.CreateByRepoId returned %+v, want %+v", envVar, want) } @@ -129,7 +129,7 @@ func TestEnvVarsService_CreateByRepoSlug(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%s/env_vars", testRepoSlug), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodPost) testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false}`+"\n") - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) opt := EnvVarBody{Name: "TEST", Value: "test", Public: false} @@ -139,7 +139,7 @@ func TestEnvVarsService_CreateByRepoSlug(t *testing.T) { t.Errorf("EnvVars.CreateByRepoSlug returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(envVar, want) { t.Errorf("EnvVars.CreateByRepoSlug returned %+v, want %+v", envVar, want) } @@ -151,18 +151,18 @@ func TestEnvVarsService_UpdateByRepoId(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%d/env_var/%s", testRepoId, testEnvVarId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodPatch) - testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false}`+"\n") - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false,"env_var.branch":"foo"}`+"\n") + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) - envVar := EnvVarBody{Name: "TEST", Value: "test", Public: false} + envVar := EnvVarBody{Name: "TEST", Value: "test", Public: false, Branch: "foo"} e, _, err := client.EnvVars.UpdateByRepoId(context.Background(), testRepoId, testEnvVarId, &envVar) if err != nil { t.Errorf("EnvVar.UpdateByRepoId returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(e, want) { t.Errorf("EnvVars.UpdateByRepoId returned %+v, want %+v", envVar, want) } @@ -174,18 +174,18 @@ func TestEnvVarsService_UpdateByRepoSlug(t *testing.T) { mux.HandleFunc(fmt.Sprintf("/repo/%s/env_var/%s", testRepoSlug, testEnvVarId), func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, http.MethodPatch) - testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false}`+"\n") - fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false}`) + testBody(t, r, `{"env_var.name":"TEST","env_var.value":"test","env_var.public":false,"env_var.branch":"foo"}`+"\n") + fmt.Fprint(w, `{"id":"test-12345-absde","name":"TEST","value":"test","public":false,"branch":"foo"}`) }) - envVar := EnvVarBody{Name: "TEST", Value: "test", Public: false} + envVar := EnvVarBody{Name: "TEST", Value: "test", Public: false, Branch: "foo"} e, _, err := client.EnvVars.UpdateByRepoSlug(context.Background(), testRepoSlug, testEnvVarId, &envVar) if err != nil { t.Errorf("EnvVars.UpdateByRepoSlug returned error: %v", err) } - want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false)} + want := &EnvVar{Id: String(testEnvVarId), Name: String("TEST"), Value: String("test"), Public: Bool(false), Branch: String("foo")} if !reflect.DeepEqual(e, want) { t.Errorf("EnvVars.UpdateByRepoSlug returned %+v, want %+v", e, want) }