Revert "Merge branch 'revert-b3bf3ac4' into 'master'"revert-84c3866

This reverts commit 84c3866ba69e2ca0ca7d512b09ae66458f5c1c5c, reversing
changes made to 185e0a0e5c621f350335495291c535e5c05df89b.

1 files changed, 20 insertions, 22 deletions

diff --git a/internal/source/domains_test.go b/internal/source/domains_test.go
index 24008b08..2382e756 100644
--- a/internal/source/domains_test.go
+++ b/internal/source/domains_test.go
@@ -65,24 +65,21 @@ func TestGetDomain(t *testing.T) {
 		newSource.On("GetDomain", testDomain).
 			Return(&domain.Domain{Name: testDomain}, nil).
 			Once()
+		newSource.On("IsReady").Return(true).Once()
 		defer newSource.AssertExpectations(t)
 
-		domains := &Domains{
-			disk:   disk.New(),
-			gitlab: newSource,
-		}
+		domains := newTestDomains(t, newSource)
 
 		domains.GetDomain(testDomain)
 	})
 
 	t.Run("when requesting a non-test domain", func(t *testing.T) {
 		newSource := NewMockSource()
+		newSource.On("IsReady").Return(true).Once()
+
 		defer newSource.AssertExpectations(t)
 
-		domains := &Domains{
-			disk:   disk.New(),
-			gitlab: newSource,
-		}
+		domains := newTestDomains(t, newSource)
 
 		domain, err := domains.GetDomain("domain.test.io")
 
@@ -94,10 +91,7 @@ func TestGetDomain(t *testing.T) {
 		newSource := NewMockSource()
 		defer newSource.AssertExpectations(t)
 
-		domains := &Domains{
-			disk:   disk.New(),
-			gitlab: newSource,
-		}
+		domains := newTestDomains(t, newSource)
 
 		domain, err := domains.GetDomain("pages-broken-poc.gitlab.io")
 
@@ -122,12 +116,11 @@ func TestGetDomain(t *testing.T) {
 		newSource.On("GetDomain", testDomain).
 			Return(&domain.Domain{Name: testDomain}, nil).
 			Once()
+		newSource.On("IsReady").Return(true).Once()
+
 		defer newSource.AssertExpectations(t)
 
-		domains := &Domains{
-			disk:   disk.New(),
-			gitlab: newSource,
-		}
+		domains := newTestDomains(t, newSource)
 
 		domains.GetDomain(testDomain)
 	})
@@ -156,8 +149,6 @@ func TestGetDomainWithIncrementalrolloutOfGitLabSource(t *testing.T) {
 	// Generates FNV 2643293380, 2643293380 % 100 = 80
 	domain80 := "test-domain-b.com"
 
-	diskSource := disk.New()
-
 	gitlabSourceConfig.Domains.Rollout.Percentage = 80
 
 	type testDomain struct {
@@ -201,12 +192,10 @@ func TestGetDomainWithIncrementalrolloutOfGitLabSource(t *testing.T) {
 						Once()
 				}
 			}
+			gitlabSource.On("IsReady").Return(true)
 			defer gitlabSource.AssertExpectations(t)
 
-			domains := &Domains{
-				disk:   diskSource,
-				gitlab: gitlabSource,
-			}
+			domains := newTestDomains(t, gitlabSource)
 
 			gitlabSourceConfig.Domains.Rollout.Stickiness = tc.stickiness
 
@@ -217,3 +206,12 @@ func TestGetDomainWithIncrementalrolloutOfGitLabSource(t *testing.T) {
 		})
 	}
 }
+
+func newTestDomains(t *testing.T, gitlabSource *MockSource) *Domains {
+	t.Helper()
+
+	return &Domains{
+		disk:   disk.New(),
+		gitlab: gitlabSource,
+	}
+}