Rename FailedScreenshot to FailureScreenshot #186

getgauge · Aug 13, 2018 · 55e8df9 · 55e8df9
1 parent 5d144b8
commit 55e8df9
Show file tree

Hide file tree

Showing 10 changed files with 178 additions and 177 deletions.
diff --git a/gauge-proto b/gauge-proto
diff --git a/gauge_messages/spec.pb.go b/gauge_messages/spec.pb.go
diff --git a/generator/_testdata/dummyReportTheme/views/partials.tmpl b/generator/_testdata/dummyReportTheme/views/partials.tmpl
@@ -162,11 +162,11 @@
       <div class="exception">
         <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
-      {{if .FailedScreenshot}}
+      {{if .FailureScreenshot}}
         <div class="screenshot-container">
           <div class="screenshot">
-            <a href="data:image/png;base64,{{.FailedScreenshot}}" rel="lightbox">
-              <img src="data:image/png;base64,{{.FailedScreenshot}}" class="screenshot-thumbnail" />
+            <a href="data:image/png;base64,{{.FailureScreenshot}}" rel="lightbox">
+              <img src="data:image/png;base64,{{.FailureScreenshot}}" class="screenshot-thumbnail" />
             </a>
           </div>
         </div>
@@ -397,11 +397,11 @@
         </h4>
         <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
-      {{ if .FailedScreenshot}}
+      {{ if .FailureScreenshot}}
         <div class="screenshot-container">
           <div class="screenshot">
-            <a href="data:image/png;base64,{{.FailedScreenshot}}" rel="lightbox">
-              <img src="data:image/png;base64,{{.FailedScreenshot}}" class="screenshot-thumbnail" />
+            <a href="data:image/png;base64,{{.FailureScreenshot}}" rel="lightbox">
+              <img src="data:image/png;base64,{{.FailureScreenshot}}" class="screenshot-thumbnail" />
             </a>
           </div>
         </div>

diff --git a/generator/generate.go b/generator/generate.go
@@ -181,7 +181,7 @@ func (s *step) Kind() tokenKind {
 type result struct {
 	Status           status    `json:"Status"`
 	StackTrace       string    `json:"StackTrace"`
-	FailedScreenshot string    `json:"Screenshot"`
+	FailureScreenshot string    `json:"Screenshot"`
 	ErrorMessage     string    `json:"ErrorMessage"`
 	ExecutionTime    string    `json:"ExecutionTime"`
 	SkippedReason    string    `json:"SkippedReason"`
@@ -193,7 +193,7 @@ type result struct {
 type hookFailure struct {
 	HookName         string `json:"HookName"`
 	ErrMsg           string `json:"ErrMsg"`
-	FailedScreenshot string `json:"Screenshot"`
+	FailureScreenshot string `json:"Screenshot"`
 	StackTrace       string `json:"StackTrace"`
 	TableRowIndex    int32  `json:"TableRowIndex"`
 }

diff --git a/generator/generate_test.go b/generator/generate_test.go
@@ -542,7 +542,7 @@ func newHookFailure(name, errMsg, screenshot, stacktrace string) *hookFailure {
 	return &hookFailure{
 		HookName:         name,
 		ErrMsg:           errMsg,
-		FailedScreenshot: screenshot,
+		FailureScreenshot: screenshot,
 		StackTrace:       stacktrace,
 	}
 }

diff --git a/generator/integration_test.go b/generator/integration_test.go
@@ -145,7 +145,7 @@ var scenarioWithAfterHookFail = &gm.ProtoScenario{
 	PostHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "java.lang.RuntimeException",
 		StackTrace:       newStackTrace(),
-		FailedScreenshot: []byte(newScreenshot()),
+		FailureScreenshot: []byte(newScreenshot()),
 	},
 }
 
@@ -159,7 +159,7 @@ var scenarioWithBeforeHookFail = &gm.ProtoScenario{
 	PreHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "java.lang.RuntimeException",
 		StackTrace:       newStackTrace(),
-		FailedScreenshot: []byte(newScreenshot()),
+		FailureScreenshot: []byte(newScreenshot()),
 	},
 }
 
@@ -173,12 +173,12 @@ var scenarioWithBeforeAndAfterHookFail = &gm.ProtoScenario{
 	PreHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "java.lang.RuntimeException",
 		StackTrace:       newStackTrace(),
-		FailedScreenshot: []byte(newScreenshot()),
+		FailureScreenshot: []byte(newScreenshot()),
 	},
 	PostHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "java.lang.RuntimeException",
 		StackTrace:       newStackTrace(),
-		FailedScreenshot: []byte(newScreenshot()),
+		FailureScreenshot: []byte(newScreenshot()),
 	},
 }
 
@@ -207,7 +207,7 @@ var stepWithBeforeHookFail = &gm.ProtoItem{
 			PreHookFailure: &gm.ProtoHookFailure{
 				ErrorMessage:     "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 			},
 		},
 		Fragments: []*gm.Fragment{newTextFragment("This is a failing step")},
@@ -225,7 +225,7 @@ var stepWithAfterHookFail = &gm.ProtoItem{
 			PostHookFailure: &gm.ProtoHookFailure{
 				ErrorMessage:     "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 			},
 		},
 		Fragments: []*gm.Fragment{newTextFragment("This is a failing step")},
@@ -243,12 +243,12 @@ var stepWithBeforeAndAfterHookFail = &gm.ProtoItem{
 			PreHookFailure: &gm.ProtoHookFailure{
 				ErrorMessage:     "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 			},
 			PostHookFailure: &gm.ProtoHookFailure{
 				ErrorMessage:     "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 			},
 		},
 		Fragments: []*gm.Fragment{newTextFragment("This is a failing step")},
@@ -264,7 +264,7 @@ var failedStep = &gm.ProtoItem{
 				ExecutionTime:    211316,
 				ErrorMessage:     "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 			},
 		},
 		Fragments: []*gm.Fragment{newTextFragment("This is a failing step")},
@@ -568,7 +568,7 @@ var failSpecResWithAfterSpecFailure = &gm.ProtoSpecResult{
 		PostHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "java.lang.RuntimeException",
 			StackTrace:       newStackTrace(),
-			FailedScreenshot: []byte(newScreenshot()),
+			FailureScreenshot: []byte(newScreenshot()),
 		}},
 	},
 }
@@ -602,7 +602,7 @@ var failSpecResWithBeforeSpecFailure = &gm.ProtoSpecResult{
 		PreHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "java.lang.RuntimeException",
 			StackTrace:       newStackTrace(),
-			FailedScreenshot: []byte(newScreenshot()),
+			FailureScreenshot: []byte(newScreenshot()),
 		}},
 	},
 }
@@ -648,7 +648,7 @@ var failSpecResWithBeforeSpecFailureWithTableDriven = &gm.ProtoSpecResult{
 		PreHookFailures: []*gm.ProtoHookFailure{
 			{ErrorMessage: "java.lang.RuntimeException",
 				StackTrace:       newStackTrace(),
-				FailedScreenshot: []byte(newScreenshot()),
+				FailureScreenshot: []byte(newScreenshot()),
 				TableRowIndex:    int32(1)},
 		},
 	},
@@ -693,7 +693,7 @@ var failSpecResWithAfterSpecFailureWithTableDriven = &gm.ProtoSpecResult{
 			},
 		},
 		PostHookFailures: []*gm.ProtoHookFailure{
-			{ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), FailedScreenshot: []byte(newScreenshot()), TableRowIndex: int32(0)},
+			{ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), FailureScreenshot: []byte(newScreenshot()), TableRowIndex: int32(0)},
 		},
 	},
 }
@@ -726,12 +726,12 @@ var failSpecResWithBeforeAfterSpecFailure = &gm.ProtoSpecResult{
 		PreHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "java.lang.RuntimeException",
 			StackTrace:       newStackTrace(),
-			FailedScreenshot: []byte(newScreenshot()),
+			FailureScreenshot: []byte(newScreenshot()),
 		}},
 		PostHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "java.lang.RuntimeException",
 			StackTrace:       newStackTrace(),
-			FailedScreenshot: []byte(newScreenshot()),
+			FailureScreenshot: []byte(newScreenshot()),
 		}},
 	},
 }
@@ -786,7 +786,7 @@ func newProtoHookFailure() *gm.ProtoHookFailure {
 	return &gm.ProtoHookFailure{
 		ErrorMessage:     "java.lang.RuntimeException",
 		StackTrace:       newStackTrace(),
-		FailedScreenshot: []byte(newScreenshot()),
+		FailureScreenshot: []byte(newScreenshot()),
 	}
 }
 

diff --git a/generator/transform.go b/generator/transform.go
@@ -172,7 +172,7 @@ func toHookFailure(failure *gm.ProtoHookFailure, hookName string) *hookFailure {
 		HookName:         hookName,
 		StackTrace:       failure.GetStackTrace(),
 		TableRowIndex:    failure.TableRowIndex,
-		FailedScreenshot: base64.StdEncoding.EncodeToString(failure.GetFailedScreenshot()),
+		FailureScreenshot: base64.StdEncoding.EncodeToString(failure.GetFailureScreenshot()),
 	}
 	return result
 }
@@ -461,7 +461,7 @@ func toStep(protoStep *gm.ProtoStep) *step {
 		ErrorMessage:     res.GetErrorMessage(),
 		ExecutionTime:    formatTime(res.GetExecutionTime()),
 		Messages:         res.GetMessage(),
-		FailedScreenshot: base64.StdEncoding.EncodeToString(res.GetFailedScreenshot()),
+		FailureScreenshot: base64.StdEncoding.EncodeToString(res.GetFailureScreenshot()),
 	}
 	for _, s := range res.GetScreenshots() {
 		result.Screenshots = append(result.Screenshots, base64.StdEncoding.EncodeToString(s))

diff --git a/generator/transform_test.go b/generator/transform_test.go
@@ -286,12 +286,12 @@ var specResWithSpecHookFailure = &gm.ProtoSpecResult{
 		PreHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "err",
 			StackTrace:       "Stacktrace",
-			FailedScreenshot: []byte("Screenshot"),
+			FailureScreenshot: []byte("Screenshot"),
 		}},
 		PostHookFailures: []*gm.ProtoHookFailure{{
 			ErrorMessage:     "err",
 			StackTrace:       "Stacktrace",
-			FailedScreenshot: []byte("Screenshot"),
+			FailureScreenshot: []byte("Screenshot"),
 		}},
 	},
 }
@@ -365,12 +365,12 @@ var scnWithHookFailure = &gm.ProtoScenario{
 	PreHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "err",
 		StackTrace:       "Stacktrace",
-		FailedScreenshot: []byte("Screenshot"),
+		FailureScreenshot: []byte("Screenshot"),
 	},
 	PostHookFailure: &gm.ProtoHookFailure{
 		ErrorMessage:     "err",
 		StackTrace:       "Stacktrace",
-		FailedScreenshot: []byte("Screenshot"),
+		FailureScreenshot: []byte("Screenshot"),
 	},
 }
 
@@ -510,15 +510,15 @@ var protoStepWithAfterHookFailure = &gm.ProtoStep{
 		PostHookFailure: &gm.ProtoHookFailure{
 			ErrorMessage:     "err",
 			StackTrace:       "Stacktrace",
-			FailedScreenshot: []byte("Screenshot"),
+			FailureScreenshot: []byte("Screenshot"),
 		},
 	},
 }
 
 var failedHookFailure = &gm.ProtoHookFailure{
 	ErrorMessage:     "java.lang.RuntimeException",
 	StackTrace:       newStackTrace(),
-	FailedScreenshot: []byte(newScreenshot()),
+	FailureScreenshot: []byte(newScreenshot()),
 }
 
 func TestToOverview(t *testing.T) {
@@ -847,14 +847,14 @@ func TestToSpecWithDataTableExecutionStatusFail(t *testing.T) {
 }
 
 func TestToSpecWithBeforeHookFailure(t *testing.T) {
-	want := []*hookFailure{{ErrMsg: "err", HookName: "Before Spec", FailedScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace"}}
+	want := []*hookFailure{{ErrMsg: "err", HookName: "Before Spec", FailureScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace"}}
 	got := toSpec(specResWithSpecHookFailure).BeforeSpecHookFailures
 
 	checkEqual(t, "", want, got)
 }
 
 func TestToSpecWithAfterHookFailure(t *testing.T) {
-	want := []*hookFailure{{ErrMsg: "err", HookName: "After Spec", FailedScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace", TableRowIndex: 0}}
+	want := []*hookFailure{{ErrMsg: "err", HookName: "After Spec", FailureScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace", TableRowIndex: 0}}
 	got := toSpec(specResWithSpecHookFailure).AfterSpecHookFailures
 
 	checkEqual(t, "", want, got)

diff --git a/themes/default/assets/css/style.css b/themes/default/assets/css/style.css
@@ -1084,6 +1084,7 @@ footer p {
         flex-wrap: wrap;
         width: 100%;
         margin-top: 10px;
+        margin-left: 10px;
     }
 
     .scenario-container .screenshot {

diff --git a/themes/default/views/partials.tmpl b/themes/default/views/partials.tmpl
@@ -162,11 +162,11 @@
       <div class="exception">
         <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
-      {{if .FailedScreenshot}}
+      {{if .FailureScreenshot}}
         <div class="screenshot-container">
           <div class="screenshot">
-            <a href="data:image/png;base64,{{.FailedScreenshot}}" rel="lightbox">
-              <img src="data:image/png;base64,{{.FailedScreenshot}}" class="screenshot-thumbnail" />
+            <a href="data:image/png;base64,{{.FailureScreenshot}}" rel="lightbox">
+              <img src="data:image/png;base64,{{.FailureScreenshot}}" class="screenshot-thumbnail" />
             </a>
           </div>
         </div>
@@ -397,11 +397,11 @@
         </h4>
         <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
-      {{ if .FailedScreenshot}}
+      {{ if .FailureScreenshot}}
         <div class="screenshot-container">
           <div class="screenshot">
-            <a href="data:image/png;base64,{{.FailedScreenshot}}" rel="lightbox">
-              <img src="data:image/png;base64,{{.FailedScreenshot}}" class="screenshot-thumbnail" />
+            <a href="data:image/png;base64,{{.FailureScreenshot}}" rel="lightbox">
+              <img src="data:image/png;base64,{{.FailureScreenshot}}" class="screenshot-thumbnail" />
             </a>
           </div>
         </div>