Add acceptence test for default reviews and hook

builtin/providers/bitbucket/resource_default_reviewers.go

@@ -24,7 +24,7 @@ func resourceDefaultReviewers() *schema.Resource {
 		Delete: resourceDefaultReviewersDelete,
 
 		Schema: map[string]*schema.Schema{
-			"username": {
+			"owner": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
@@ -50,7 +50,7 @@ func resourceDefaultReviewersCreate(d *schema.ResourceData, m interface{}) error
 
 	for _, user := range d.Get("reviewers").(*schema.Set).List() {
 		reviewer_resp, err := client.PutOnly(fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers/%s",
-			d.Get("username").(string),
+			d.Get("owner").(string),
 			d.Get("repository").(string),
 			user,
 		))
@@ -59,25 +59,26 @@ func resourceDefaultReviewersCreate(d *schema.ResourceData, m interface{}) error
 			return err
 		}
 
-		if reviewer_resp.StatusCode != 201 {
+		if reviewer_resp.StatusCode != 200 {
 			return fmt.Errorf("Failed to create reviewer %s got code %d", user.(string), reviewer_resp.StatusCode)
 		}
 
 		defer reviewer_resp.Body.Close()
 	}
 
-	d.SetId(fmt.Sprintf("%s/%s/reviewers", d.Get("username").(string), d.Get("repository").(string)))
+	d.SetId(fmt.Sprintf("%s/%s/reviewers", d.Get("owner").(string), d.Get("repository").(string)))
 	return resourceDefaultReviewersRead(d, m)
 }
 func resourceDefaultReviewersRead(d *schema.ResourceData, m interface{}) error {
 	client := m.(*BitbucketClient)
 
 	reviewers_response, err := client.Get(fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers",
-		d.Get("username").(string),
+		d.Get("owner").(string),
 		d.Get("repository").(string),
 	))
 
 	var reviewers PaginatedReviewers
+
 	decoder := json.NewDecoder(reviewers_response.Body)
 	err = decoder.Decode(&reviewers)
 	if err != nil {
@@ -98,15 +99,23 @@ func resourceDefaultReviewersDelete(d *schema.ResourceData, m interface{}) error
 	client := m.(*BitbucketClient)
 
 	for _, user := range d.Get("reviewers").(*schema.Set).List() {
-		_, err := client.Delete(fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers/%s",
+		resp, err := client.Delete(fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers/%s",
-			d.Get("username").(string),
+			d.Get("owner").(string),
 			d.Get("repository").(string),
-			user,
+			user.(string),
 		))
 
 		if err != nil {
 			return err
 		}
+
+		if resp.StatusCode != 204 {
+			return fmt.Errorf("[%d] Could not delete %s from default reviewer",
+				resp.StatusCode,
+				user.(string),
+			)
+		}
+		defer resp.Body.Close()
 	}
 	return nil
 }

builtin/providers/bitbucket/resource_default_reviewers_test.go

@@ -0,0 +1,67 @@
+package bitbucket
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccBitbucketDefaultReviewers_basic(t *testing.T) {
+
+	testUser := os.Getenv("BITBUCKET_USERNAME")
+	testAccBitbucketDefaultReviewersConfig := fmt.Sprintf(`
+		resource "bitbucket_repository" "test_repo" {
+			owner = "%s"
+			name = "test-repo-default-reviewers"
+		}
+
+		resource "bitbucket_default_reviewers" "test_reviewers" {
+			owner = "%s"
+			repository = "${bitbucket_repository.test_repo.name}"
+			reviewers = [
+				"%s",
+			]
+		}
+	`, testUser, testUser, testUser)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckBitbucketDefaultReviewersDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccBitbucketDefaultReviewersConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckBitbucketDefaultReviewersExists("bitbucket_default_reviewers.test_reviewers"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckBitbucketDefaultReviewersDestroy(s *terraform.State) error {
+	_, ok := s.RootModule().Resources["bitbucket_default_reviewers.test_reviewers"]
+	if !ok {
+		return fmt.Errorf("Not found %s", "bitbucket_default_reviewers.test_reviewers")
+	}
+	return nil
+}
+
+func testAccCheckBitbucketDefaultReviewersExists(n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+
+		if !ok {
+			return fmt.Errorf("Not found %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No default reviewers ID is set")
+		}
+
+		return nil
+	}
+}

builtin/providers/bitbucket/resource_hook_test.go

@@ -0,0 +1,78 @@
+package bitbucket
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccBitbucketHook_basic(t *testing.T) {
+	var hook Hook
+
+	testUser := os.Getenv("BITBUCKET_USERNAME")
+	testAccBitbucketHookConfig := fmt.Sprintf(`
+		resource "bitbucket_repository" "test_repo" {
+			owner = "%s"
+			name = "test-repo"
+		}
+		resource "bitbucket_hook" "test_repo_hook" {
+			owner = "%s"
+			repository = "${bitbucket_repository.test_repo.name}"
+			description = "Test hook for terraform"
+			url = "https://httpbin.org"
+			events = [
+				"repo:push",
+			]
+		}
+	`, testUser, testUser)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckBitbucketHookDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccBitbucketHookConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckBitbucketHookExists("bitbucket_hook.test_repo_hook", &hook),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckBitbucketHookDestroy(s *terraform.State) error {
+	client := testAccProvider.Meta().(*BitbucketClient)
+	rs, ok := s.RootModule().Resources["bitbucket_hook.test_repo_hook"]
+	if !ok {
+		return fmt.Errorf("Not found %s", "bitbucket_hook.test_repo_hook")
+	}
+
+	response, err := client.Get(fmt.Sprintf("2.0/repositories/%s/%s/hooks/%s", rs.Primary.Attributes["owner"], rs.Primary.Attributes["repository"], rs.Primary.Attributes["uuid"]))
+
+	if err != nil {
+		return err
+	}
+
+	if response.StatusCode != 404 {
+		return fmt.Errorf("Hook still exists")
+	}
+
+	return nil
+}
+
+func testAccCheckBitbucketHookExists(n string, hook *Hook) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found %s", n)
+		}
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No Hook ID is set")
+		}
+		return nil
+	}
+}