Skip to content

Commit 917e124

Browse files
authored
Merge pull request #36 from nimblehq/chore/refactor-create-template-test
Update assertion to use ContainSubstring matcher
2 parents 5733a22 + f89e82e commit 917e124

File tree

1 file changed

+40
-41
lines changed

1 file changed

+40
-41
lines changed

cmd/create_test.go

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd_test
22

33
import (
44
"os"
5-
"strings"
65

76
"github.com/nimblehq/gin-templates/tests"
87

@@ -22,191 +21,191 @@ var _ = Describe("Create template", func() {
2221
Fail("Failed to get current directory: " + err.Error())
2322
}
2423

25-
directoryContainProjectName := strings.Contains(dir, "gin-templates/cmd/test-gin-templates")
24+
expectedContent := "gin-templates/cmd/test-gin-templates"
2625

27-
Expect(directoryContainProjectName).To(BeTrue())
26+
Expect(dir).To(ContainSubstring(expectedContent))
2827
})
2928
})
3029

3130
Context("given .env.example", func() {
3231
It("contains project name at DATABASE_URL", func() {
3332
content := tests.ReadFile(".env.example")
3433

35-
fileContainProjectName := strings.Contains(content, "DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5432/test-gin-templates_development?sslmode=disable")
34+
expectedContent := "DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5432/test-gin-templates_development?sslmode=disable"
3635

37-
Expect(fileContainProjectName).To(BeTrue())
36+
Expect(content).To(ContainSubstring(expectedContent))
3837
})
3938
})
4039

4140
Context("given .env.test", func() {
4241
It("contains project name at DATABASE_URL", func() {
4342
content := tests.ReadFile(".env.test")
4443

45-
fileContainProjectName := strings.Contains(content, "DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5433/test-gin-templates_test?sslmode=disable")
44+
expectedContent := "DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5433/test-gin-templates_test?sslmode=disable"
4645

47-
Expect(fileContainProjectName).To(BeTrue())
46+
Expect(content).To(ContainSubstring(expectedContent))
4847
})
4948
})
5049

5150
Context("given docker-compose.dev.yml", func() {
5251
It("contains project name at container_name", func() {
5352
content := tests.ReadFile("docker-compose.dev.yml")
5453

55-
fileContainProjectName := strings.Contains(content, "container_name: test-gin-templates_db")
54+
expectedContent := "container_name: test-gin-templates_db"
5655

57-
Expect(fileContainProjectName).To(BeTrue())
56+
Expect(content).To(ContainSubstring(expectedContent))
5857
})
5958

6059
It("contains project name at postgres db env", func() {
6160
content := tests.ReadFile("docker-compose.dev.yml")
6261

63-
fileContainProjectName := strings.Contains(content, "- POSTGRES_DB=test-gin-templates_development")
62+
expectedContent := "- POSTGRES_DB=test-gin-templates_development"
6463

65-
Expect(fileContainProjectName).To(BeTrue())
64+
Expect(content).To(ContainSubstring(expectedContent))
6665
})
6766
})
6867

6968
Context("given docker-compose.test.yml", func() {
7069
It("contains project name at container_name", func() {
7170
content := tests.ReadFile("docker-compose.test.yml")
7271

73-
fileContainProjectName := strings.Contains(content, "container_name: test-gin-templates_db_test")
72+
expectedContent := "container_name: test-gin-templates_db_test"
7473

75-
Expect(fileContainProjectName).To(BeTrue())
74+
Expect(content).To(ContainSubstring(expectedContent))
7675
})
7776

7877
It("contains project name at postgres db env", func() {
7978
content := tests.ReadFile("docker-compose.test.yml")
8079

81-
fileContainProjectName := strings.Contains(content, "- POSTGRES_DB=test-gin-templates_test")
80+
expectedContent := "- POSTGRES_DB=test-gin-templates_test"
8281

83-
Expect(fileContainProjectName).To(BeTrue())
82+
Expect(content).To(ContainSubstring(expectedContent))
8483
})
8584
})
8685

8786
Context("given go.mod", func() {
8887
It("contains project name at module name", func() {
8988
content := tests.ReadFile("go.mod")
9089

91-
fileContainProjectName := strings.Contains(content, "module github.com/nimblehq/test-gin-templates")
90+
expectedContent := "module github.com/nimblehq/test-gin-templates"
9291

93-
Expect(fileContainProjectName).To(BeTrue())
92+
Expect(content).To(ContainSubstring(expectedContent))
9493
})
9594
})
9695

9796
Context("given bootstrap/database.go", func() {
9897
It("contains project name at helpers import", func() {
9998
content := tests.ReadFile("bootstrap/database.go")
10099

101-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/helpers"`)
100+
expectedContent := `"github.com/nimblehq/test-gin-templates/helpers"`
102101

103-
Expect(fileContainProjectName).To(BeTrue())
102+
Expect(content).To(ContainSubstring(expectedContent))
104103
})
105104
})
106105

107106
Context("given bootstrap/router.go", func() {
108107
It("contains project name at api v1 routers import", func() {
109108
content := tests.ReadFile("bootstrap/router.go")
110109

111-
fileContainProjectName := strings.Contains(content, `apiv1router "github.com/nimblehq/test-gin-templates/lib/api/v1/routers"`)
110+
expectedContent := `apiv1router "github.com/nimblehq/test-gin-templates/lib/api/v1/routers"`
112111

113-
Expect(fileContainProjectName).To(BeTrue())
112+
Expect(content).To(ContainSubstring(expectedContent))
114113
})
115114
})
116115

117116
Context("given cmd/api/main.go", func() {
118117
It("contains project name at bootstrap import", func() {
119118
content := tests.ReadFile("cmd/api/main.go")
120119

121-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/bootstrap"`)
120+
expectedContent := `"github.com/nimblehq/test-gin-templates/bootstrap"`
122121

123-
Expect(fileContainProjectName).To(BeTrue())
122+
Expect(content).To(ContainSubstring(expectedContent))
124123
})
125124
})
126125

127126
Context("given config/app.toml", func() {
128127
It("contains project name at app_name", func() {
129128
content := tests.ReadFile("config/app.toml")
130129

131-
fileContainProjectName := strings.Contains(content, `app_name = "test-gin-templates"`)
130+
expectedContent := `app_name = "test-gin-templates"`
132131

133-
Expect(fileContainProjectName).To(BeTrue())
132+
Expect(content).To(ContainSubstring(expectedContent))
134133
})
135134

136135
It("contains project name at debug db name", func() {
137136
content := tests.ReadFile("config/app.toml")
138137

139-
fileContainProjectName := strings.Contains(content, `db_name = "test-gin-templates_development"`)
138+
expectedContent := `db_name = "test-gin-templates_development"`
140139

141-
Expect(fileContainProjectName).To(BeTrue())
140+
Expect(content).To(ContainSubstring(expectedContent))
142141
})
143142

144143
It("contains project name at test db name", func() {
145144
content := tests.ReadFile("config/app.toml")
146145

147-
fileContainProjectName := strings.Contains(content, `db_name = "test-gin-templates_test"`)
146+
expectedContent := `db_name = "test-gin-templates_test"`
148147

149-
Expect(fileContainProjectName).To(BeTrue())
148+
Expect(content).To(ContainSubstring(expectedContent))
150149
})
151150
})
152151

153152
Context("given helpers/config_test.go", func() {
154153
It("contains project name at helpers import", func() {
155154
content := tests.ReadFile("helpers/config_test.go")
156155

157-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/helpers"`)
156+
expectedContent := `"github.com/nimblehq/test-gin-templates/helpers"`
158157

159-
Expect(fileContainProjectName).To(BeTrue())
158+
Expect(content).To(ContainSubstring(expectedContent))
160159
})
161160
})
162161

163162
Context("given helpers/helpers_suite_test.go", func() {
164163
It("contains project name at test import", func() {
165164
content := tests.ReadFile("helpers/helpers_suite_test.go")
166165

167-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/test"`)
166+
expectedContent := `"github.com/nimblehq/test-gin-templates/test"`
168167

169-
Expect(fileContainProjectName).To(BeTrue())
168+
Expect(content).To(ContainSubstring(expectedContent))
170169
})
171170
})
172171

173172
Context("given lib/api/v1/controllers/controllers_suite_test.go", func() {
174173
It("contains project name at test import", func() {
175174
content := tests.ReadFile("lib/api/v1/controllers/controllers_suite_test.go")
176175

177-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/test"`)
176+
expectedContent := `"github.com/nimblehq/test-gin-templates/test"`
178177

179-
Expect(fileContainProjectName).To(BeTrue())
178+
Expect(content).To(ContainSubstring(expectedContent))
180179
})
181180
})
182181

183182
Context("given lib/api/v1/controllers/health_test.go", func() {
184183
It("contains project name at test import", func() {
185184
content := tests.ReadFile("lib/api/v1/controllers/health_test.go")
186185

187-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/test"`)
186+
expectedContent := `"github.com/nimblehq/test-gin-templates/test"`
188187

189-
Expect(fileContainProjectName).To(BeTrue())
188+
Expect(content).To(ContainSubstring(expectedContent))
190189
})
191190
})
192191

193192
Context("given lib/api/v1/routers/router.go", func() {
194193
It("contains project name at api v1 controllers import", func() {
195194
content := tests.ReadFile("lib/api/v1/routers/router.go")
196195

197-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/lib/api/v1/controllers"`)
196+
expectedContent := `"github.com/nimblehq/test-gin-templates/lib/api/v1/controllers"`
198197

199-
Expect(fileContainProjectName).To(BeTrue())
198+
Expect(content).To(ContainSubstring(expectedContent))
200199
})
201200
})
202201

203202
Context("given test/test.go", func() {
204203
It("contains project name at bootstrap import", func() {
205204
content := tests.ReadFile("test/test.go")
206205

207-
fileContainProjectName := strings.Contains(content, `"github.com/nimblehq/test-gin-templates/bootstrap"`)
206+
expectedContent := `"github.com/nimblehq/test-gin-templates/bootstrap"`
208207

209-
Expect(fileContainProjectName).To(BeTrue())
208+
Expect(content).To(ContainSubstring(expectedContent))
210209
})
211210
})
212211
})

0 commit comments

Comments
 (0)