Skip to content

Commit 61ed927

Browse files
Merge pull request shipwright-io#1620 from shipwright-io/refactor/image-processing-tests
Refactor/simplify test asset directory look-up
2 parents 5a55672 + 9362315 commit 61ed927

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

cmd/image-processing/main_test.go

+1-8
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,7 @@ var _ = Describe("Image Processing Resource", Ordered, func() {
405405
})
406406

407407
Context("vulnerability scanning", func() {
408-
var directory string
409-
BeforeEach(func() {
410-
cwd, err := os.Getwd()
411-
Expect(err).ToNot(HaveOccurred())
412-
directory = path.Clean(path.Join(cwd, "../..", "test/data/images/vuln-image-in-oci"))
413-
})
408+
directory := path.Join("..", "..", "test", "data", "images", "vuln-image-in-oci")
414409

415410
It("should run vulnerability scanning if it is enabled and output vulnerabilities equal to the limit defined", func() {
416411
vulnOptions := &buildapi.VulnerabilityScanOptions{
@@ -491,7 +486,6 @@ var _ = Describe("Image Processing Resource", Ordered, func() {
491486

492487
_, err = remote.Get(ref)
493488
Expect(err).To(HaveOccurred())
494-
495489
})
496490
})
497491

@@ -540,6 +534,5 @@ var _ = Describe("Image Processing Resource", Ordered, func() {
540534
Expect(err).ToNot(HaveOccurred())
541535
})
542536
})
543-
544537
})
545538
})

0 commit comments

Comments
 (0)