Updated tests and cleaned up the code

serenity-bdd · Feb 2, 2024 · efcee55 · efcee55
1 parent 7fbc06f
commit efcee55
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/...ydides/core/requirements/WhenAssociatingATestOutcomeWithARequirementInAFeatureFile.groovy b/...ydides/core/requirements/WhenAssociatingATestOutcomeWithARequirementInAFeatureFile.groovy
@@ -22,7 +22,8 @@ class WhenAssociatingATestOutcomeWithARequirementInAFeatureFile extends Specific
             def testOutcome = TestOutcome.forTestInStory("someTest", Story.withIdAndPath("PlantPotatoes","Plant potatoes","grow_potatoes/grow_new_potatoes/PlantPotatoes.story"))
         then:
             capabilityProvider.getParentRequirementOf(testOutcome).isPresent()
-            capabilityProvider.getParentRequirementOf(testOutcome).get().name == "Plant Potatoes"
+            capabilityProvider.getParentRequirementOf(testOutcome).get().name == "PlantPotatoes"
+            capabilityProvider.getParentRequirementOf(testOutcome).get().displayName == "Plant Potatoes"
     }
 
     def "Should not find the requirement if there are no matching requirements for a tag"() {

diff --git a/.../test/groovy/net/thucydides/core/requirements/WhenGeneratingRequirementsReportData.groovy b/.../test/groovy/net/thucydides/core/requirements/WhenGeneratingRequirementsReportData.groovy
@@ -49,7 +49,7 @@ class WhenGeneratingRequirementsReportData extends Specification {
             RequirementsOutcomes outcomes = requirmentsOutcomeFactory.buildRequirementsOutcomesFrom(noTestOutcomes)
         then: "all the known capabilities should be listed"
             def requirementsNames = outcomes.requirementOutcomes.collect {it.requirement.name}
-            requirementsNames == ["grow cucumbers", "Grow potatoes", "Grow wheat",  "raise_chickens", "Apples", "Nice zucchinis", "Potatoes"]
+            requirementsNames == ["grow cucumbers", "grow_potatoes", "grow_wheat", "raise_chickens", "Apples", "Nice zucchinis", "Potatoes"]
         and: "the display name should be obtained from the narrative file where present"
             def requirementsDisplayNames = outcomes.requirementOutcomes.collect {it.requirement.displayName}
             requirementsDisplayNames == ["Grow cucumbers", "Grow potatoes", "Grow wheat", "Raise chickens", "Apples", "Nice zucchinis", "Potatoes title"]

diff --git a/...y/net/thucydides/core/requirements/WhenLoadingRequirementOutcomesFromTheFileSystem.groovy b/...y/net/thucydides/core/requirements/WhenLoadingRequirementOutcomesFromTheFileSystem.groovy
@@ -56,8 +56,9 @@ class WhenLoadingRequirementOutcomesFromTheFileSystem extends Specification {
         capabilityNames == ["Grow cucumbers", "Grow potatoes", "Grow wheat", "Raise chickens"]
         and: "the child requirements should be found"
         def growCucumbers = capabilities.get(0)
-        def cucumberFeatures = growCucumbers.children.collect { it.name }
-        cucumberFeatures == ["Grow green cucumbers"]
+
+        def cucumberFeatureNames = growCucumbers.children.collect { it.name }
+        cucumberFeatureNames == ["grow green cucumbers"]
     }
 
     def "Should be able to load issues from the default directory structure"() {
@@ -78,7 +79,8 @@ class WhenLoadingRequirementOutcomesFromTheFileSystem extends Specification {
         then: "the capability should be found"
         def potatoeGrowingCapability = capabilities.get(1)
         then: "the title should be a human-readable version of the directory name"
-        potatoeGrowingCapability.name == "Grow potatoes"
+        potatoeGrowingCapability.name == "grow_potatoes"
+        potatoeGrowingCapability.displayName == "Grow potatoes"
     }
 
     def "Should support feature files in the requirements directory"() {

diff --git a/...ample-story-directories/capabilities_and_features with spaces/grow potatoes/narrative.txt b/...ample-story-directories/capabilities_and_features with spaces/grow potatoes/narrative.txt
@@ -1,3 +1,5 @@
+Grow potatoes
+
 Narrative:
 In order to let my country eat chips
 As a farmer

diff --git a/...el/src/main/java/net/thucydides/model/requirements/FileSystemRequirementsTagProvider.java b/...el/src/main/java/net/thucydides/model/requirements/FileSystemRequirementsTagProvider.java
@@ -770,7 +770,6 @@ private Requirement storyNamed(String storyName, String displayName, String path
     }
 
     private Requirement leafRequirementWithNarrative(String requirementName, String displayName, String path, RequirementDefinition requirementNarrative) {
-//        String displayName = getTitleFromNarrativeOrDirectoryName(requirementNarrative, requirementName);
         String cardNumber = requirementNarrative.getCardNumber().orElse(null);
         String type = requirementNarrative.getType();
         List<String> releaseVersions = requirementNarrative.getVersionNumbers();