Fixes after rebase

pkg/transformers/tend/repository_test.go

@@ -41,15 +41,15 @@ var _ = Describe("TendRepository", func() {
 		db = test_config.NewTestDB(node)
 		test_config.CleanTestDB(db)
 		headerRepository = repositories.NewHeaderRepository(db)
-		headerId, err = headerRepository.CreateOrUpdateHeader(core.Header{})
-		Expect(err).NotTo(HaveOccurred())
-
 		tendRepository = tend.TendRepository{DB: db}
 	})
 
 	Describe("Create", func() {
-		It("persists a tend record", func() {
-			err := tendRepository.Create(headerId, []interface{}{test_data.TendModel})
+		BeforeEach(func() {
+			headerId, err = headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
+			Expect(err).NotTo(HaveOccurred())
+
+			err = tendRepository.Create(headerId, []interface{}{test_data.TendModel})
 			Expect(err).NotTo(HaveOccurred())
 		})
 
@@ -80,18 +80,12 @@ var _ = Describe("TendRepository", func() {
 		})
 
 		It("returns an error if inserting a tend record fails", func() {
-			err := tendRepository.Create(headerId, []interface{}{test_data.TendModel})
-			Expect(err).NotTo(HaveOccurred())
-
 			err = tendRepository.Create(headerId, []interface{}{test_data.TendModel})
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
 		})
 
 		It("deletes the tend record if its corresponding header record is deleted", func() {
-			err := tendRepository.Create(headerId, []interface{}{test_data.TendModel})
-			Expect(err).NotTo(HaveOccurred())
-
 			var count int
 			err = db.QueryRow(`SELECT count(*) from maker.tend`).Scan(&count)
 			Expect(err).NotTo(HaveOccurred())
@@ -107,11 +101,12 @@ var _ = Describe("TendRepository", func() {
 	})
 
 	Describe("MarkHeaderChecked", func() {
-		var headerId int64
-
 		BeforeEach(func() {
 			headerId, err = headerRepository.CreateOrUpdateHeader(fakes.FakeHeader)
 			Expect(err).NotTo(HaveOccurred())
+
+			err = tendRepository.Create(headerId, []interface{}{test_data.TendModel})
+			Expect(err).NotTo(HaveOccurred())
 		})
 
 		It("creates a row for a new headerID", func() {