Fixes an issue with duplicate inprogress reason when scenario heading…

… is same in different specs
sitture · Jan 7, 2021 · a73b9ec · a73b9ec
1 parent 95ad7c5
commit a73b9ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## v0.1.1
+
+### Fixed
+
+- Fixes an issue with duplicate inprogress reason when scenario heading is same in different specs
+
 ## v0.1.0
 
 ### Added

diff --git a/inprogress/inprogress.go b/inprogress/inprogress.go
@@ -252,21 +252,25 @@ type ScenarioWithReason struct {
 	Reason   string
 }
 
+func getScenarioMapKey(spec *gauge_messages.ProtoSpec, scenario *gauge_messages.ProtoScenario) string {
+	return fmt.Sprintf("%s_%s", spec.GetFileName(), scenario.GetScenarioHeading())
+}
+
 func GetInProgressScenariosWithReason(specs map[string]InProgressSpec) map[string]ScenarioWithReason {
 	inProgressScenarios := make(map[string]ScenarioWithReason, 0)
 	for _, spec := range specs {
 		if containsInProgressTags(spec.GetSpec().GetTags()) {
 			for _, specItem := range spec.GetSpec().GetItems() {
 				if specItem.GetItemType() == gauge_messages.ProtoItem_Comment && containsInProgressPrefix(specItem.GetComment().GetText()) {
 					for _, scenario := range spec.GetScenarios() {
-						key := scenario.GetScenarioHeading()
+						key := getScenarioMapKey(spec.GetSpec(), scenario)
 						inProgressScenarios[key] = ScenarioWithReason{scenario, specItem.GetComment().GetText()}
 					}
 				}
 			}
 		} else {
 			for _, scenario := range spec.GetScenarios() {
-				key := scenario.GetScenarioHeading()
+				key := getScenarioMapKey(spec.GetSpec(), scenario)
 				for _, scenItem := range scenario.GetScenarioItems() {
 					if scenItem.GetItemType() == gauge_messages.ProtoItem_Comment && containsInProgressPrefix(scenItem.GetComment().GetText()) {
 						inProgressScenarios[key] = ScenarioWithReason{scenario, scenItem.GetComment().GetText()}
@@ -301,7 +305,7 @@ func WriteToFile(inProgressSpecs map[string]InProgressSpec, inProgressScenariosW
 			if console {
 				logger.Infof(scenarioLine)
 			}
-			inProgressReason := inProgressScenariosWithReason[scenario.GetScenarioHeading()].Reason
+			inProgressReason := inProgressScenariosWithReason[getScenarioMapKey(spec.GetSpec(), scenario)].Reason
 			if len(strings.TrimSpace(inProgressReason)) > 0 {
 				reasonLine := fmt.Sprintf("    - %s", inProgressReason)
 				_, error = file.WriteString(reasonLine + "\n")

diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
   "id" : "inprogress",
-  "version" : "0.1.0",
+  "version" : "0.1.1",
   "name" : "In-progress",
   "description" : "Plugin for tracking in-progress specs/scenarios.",
   "install": {