Skip to content

Commit

Permalink
Merge pull request #211 from redhat-appstudio/context_to_when
Browse files Browse the repository at this point in the history 
refactor: replace Context with When
  • Loading branch information
@davidmogar
davidmogar authored Jul 12, 2023
2 parents 2ec3257 + 0822b51 commit 60962e1
Show file tree
Hide file tree
Showing 17 changed files with 132 additions and 136 deletions.
14 changes: 7 additions & 7 deletions api/v1alpha1/author_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var _ = Describe("Author webhook", Ordered, func() {
}
})

Context("When a Release is created", func() {
When("a Release is created", func() {
BeforeAll(func() {
admissionRequest.AdmissionRequest.Operation = admissionv1.Create
})
Expand Down Expand Up @@ -148,7 +148,7 @@ var _ = Describe("Author webhook", Ordered, func() {
})
})

Context("When a Release is updated", func() {
When("a Release is updated", func() {
BeforeAll(func() {
admissionRequest.AdmissionRequest.Operation = admissionv1.Update
})
Expand Down Expand Up @@ -247,7 +247,7 @@ var _ = Describe("Author webhook", Ordered, func() {
}
})

Context("When a ReleasePlan is created", func() {
When("a ReleasePlan is created", func() {
BeforeAll(func() {
admissionRequest.AdmissionRequest.Operation = admissionv1.Create
})
Expand Down Expand Up @@ -293,7 +293,7 @@ var _ = Describe("Author webhook", Ordered, func() {
})
})

Context("When a ReleasePlan is updated", func() {
When("a ReleasePlan is updated", func() {
var previousReleasePlan *ReleasePlan
BeforeEach(func() {
admissionRequest.AdmissionRequest.Operation = admissionv1.Update
Expand Down Expand Up @@ -467,7 +467,7 @@ var _ = Describe("Author webhook", Ordered, func() {
})
})

Context("When patchResponse is called", func() {
When("patchResponse is called", func() {

It("should return an admission response with a patch", func() {
pod := &corev1.Pod{
Expand All @@ -491,7 +491,7 @@ var _ = Describe("Author webhook", Ordered, func() {
})
})

Context("When setAuthorLabel is called", func() {
When("setAuthorLabel is called", func() {

It("should add the author label", func() {
pod := &corev1.Pod{
Expand Down Expand Up @@ -519,7 +519,7 @@ var _ = Describe("Author webhook", Ordered, func() {
})
})

Context("When sanitizeLabelValue is called", func() {
When("sanitizeLabelValue is called", func() {

It("should convert : to _", func() {
str := authWebhook.sanitizeLabelValue("a:b")
Expand Down
66 changes: 33 additions & 33 deletions api/v1alpha1/release_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

var _ = Describe("Release type", func() {

Context("When HasDeploymentFinished method is called", func() {
When("HasDeploymentFinished method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -60,7 +60,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When HasEveryPostActionExecutionFinished method is called", func() {
When("HasEveryPostActionExecutionFinished method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -92,7 +92,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When HasProcessingFinished method is called", func() {
When("HasProcessingFinished method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -124,7 +124,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When HasReleaseFinished method is called", func() {
When("HasReleaseFinished method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -156,7 +156,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsAttributed method is called", func() {
When("IsAttributed method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -173,7 +173,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsAutomated method is called", func() {
When("IsAutomated method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -195,7 +195,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsDeployed method is called", func() {
When("IsDeployed method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -222,7 +222,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsDeploying method is called", func() {
When("IsDeploying method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -254,7 +254,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsEveryPostActionExecuted method is called", func() {
When("IsEveryPostActionExecuted method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -281,7 +281,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsEachPostActionExecuting method is called", func() {
When("IsEachPostActionExecuting method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -313,7 +313,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsProcessed method is called", func() {
When("IsProcessed method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -340,7 +340,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsProcessing method is called", func() {
When("IsProcessing method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -372,7 +372,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsReleased method is called", func() {
When("IsReleased method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -399,7 +399,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsReleasing method is called", func() {
When("IsReleasing method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -431,7 +431,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When IsValid method is called", func() {
When("IsValid method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -458,7 +458,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkDeployed method is called", func() {
When("MarkDeployed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -500,7 +500,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkDeploying method is called", func() {
When("MarkDeploying method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -544,7 +544,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkDeploymentFailed method is called", func() {
When("MarkDeploymentFailed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -587,7 +587,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkProcessed method is called", func() {
When("MarkProcessed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -629,7 +629,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkProcessing method is called", func() {
When("MarkProcessing method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -673,7 +673,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkProcessingFailed method is called", func() {
When("MarkProcessingFailed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -716,7 +716,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkPostActionsExecuted method is called", func() {
When("MarkPostActionsExecuted method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -758,7 +758,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkPostActionsExecuting method is called", func() {
When("MarkPostActionsExecuting method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -802,7 +802,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkPostActionsExecutionFailed method is called", func() {
When("MarkPostActionsExecutionFailed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -845,7 +845,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkReleased method is called", func() {
When("MarkReleased method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -887,7 +887,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkReleasing method is called", func() {
When("MarkReleasing method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -931,7 +931,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkReleaseFailed method is called", func() {
When("MarkReleaseFailed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -974,7 +974,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkValidated method is called", func() {
When("MarkValidated method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -1008,7 +1008,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When MarkValidationFailed method is called", func() {
When("MarkValidationFailed method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -1046,7 +1046,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When SetAutomated method is called", func() {
When("SetAutomated method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -1059,7 +1059,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When getPhaseReason method is called", func() {
When("getPhaseReason method is called", func() {
var release *Release

BeforeEach(func() {
Expand All @@ -1076,7 +1076,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When hasPhaseFinished method is called", func() {
When("hasPhaseFinished method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down Expand Up @@ -1108,7 +1108,7 @@ var _ = Describe("Release type", func() {
})
})

Context("When isPhaseProgressing method is called", func() {
When("isPhaseProgressing method is called", func() {
var release *Release

BeforeEach(func() {
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/release_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = Describe("Release validation webhook", func() {
_ = k8sClient.Delete(ctx, release)
})

Context("Update Release CR fields", func() {
When("release CR fields are updated", func() {
It("Should error out when updating the resource", func() {
ctx := context.Background()

Expand Down Expand Up @@ -77,7 +77,7 @@ var _ = Describe("Release validation webhook", func() {
})
})

Describe("When ValidateDelete method is called", func() {
When("ValidateDelete method is called", func() {
It("should return nil", func() {
release := &Release{}
Expect(release.ValidateDelete()).To(BeNil())
Expand Down
Loading

0 comments on commit 60962e1

Please sign in to comment.