Merge branch 'master' of github.com:serenity-bdd/serenity-core

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
vaha · Mar 6, 2015 · 6a0cb97 · 6a0cb97
1 parent 31b4fc3
commit 6a0cb97
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 1 deletion.
diff --git a/core/src/test/groovy/net/thucydides/core/reports/WhenProcessingTestOutcomes.groovy b/core/src/test/groovy/net/thucydides/core/reports/WhenProcessingTestOutcomes.groovy
@@ -257,7 +257,7 @@ class WhenProcessingTestOutcomes extends Specification {
 
     def "should count the number of scenarios correctly"() {
         when:
-            def testOutcomes = TestOutcomeLoader.loadTestOutcomes().inFormat(OutcomeFormat.JSON).from(directoryInClasspathCalled("/json-passing-pending"));
+            def testOutcomes = TestOutcomeLoader.loadTestOutcomes().inFormat(OutcomeFormat.JSON).from(directoryInClasspathCalled("/samplefulljsonreport"));
         then:
             testOutcomes.totalTestScenarios == 11
         and:

diff --git a/...241ec28ac8da239e820d0db5fc890e0cde4a.json → ...241ec28ac8da239e820d0db5fc890e0cde4a.json b/...241ec28ac8da239e820d0db5fc890e0cde4a.json → ...241ec28ac8da239e820d0db5fc890e0cde4a.json
diff --git a/...629f586ae2004448d29ecbe66fcc500af301.json → ...629f586ae2004448d29ecbe66fcc500af301.json b/...629f586ae2004448d29ecbe66fcc500af301.json → ...629f586ae2004448d29ecbe66fcc500af301.json
diff --git a/...b771e92d357f8bd596ee191b5a9b9b543a58.json → ...b771e92d357f8bd596ee191b5a9b9b543a58.json b/...b771e92d357f8bd596ee191b5a9b9b543a58.json → ...b771e92d357f8bd596ee191b5a9b9b543a58.json
diff --git a/...3b271ac0091dd0739718b265707999373aec.json → ...3b271ac0091dd0739718b265707999373aec.json b/...3b271ac0091dd0739718b265707999373aec.json → ...3b271ac0091dd0739718b265707999373aec.json
diff --git a/...4aca666c6441d3379c8c11b96ac9737102e4.json → ...4aca666c6441d3379c8c11b96ac9737102e4.json b/...4aca666c6441d3379c8c11b96ac9737102e4.json → ...4aca666c6441d3379c8c11b96ac9737102e4.json
diff --git a/...bc9e2b5fbb993811db247afd049a82e2ce57.json → ...bc9e2b5fbb993811db247afd049a82e2ce57.json b/...bc9e2b5fbb993811db247afd049a82e2ce57.json → ...bc9e2b5fbb993811db247afd049a82e2ce57.json
diff --git a/...2e405ca2995e81a495828eb1edaadf120d77.json → ...2e405ca2995e81a495828eb1edaadf120d77.json b/...2e405ca2995e81a495828eb1edaadf120d77.json → ...2e405ca2995e81a495828eb1edaadf120d77.json
diff --git a/...531d0d47b745feb7af3396a1f0045417fe56.json → ...531d0d47b745feb7af3396a1f0045417fe56.json b/...531d0d47b745feb7af3396a1f0045417fe56.json → ...531d0d47b745feb7af3396a1f0045417fe56.json
diff --git a/...0af497bb19c9d8047412c17f1dddd6573e2d.json → ...0af497bb19c9d8047412c17f1dddd6573e2d.json b/...0af497bb19c9d8047412c17f1dddd6573e2d.json → ...0af497bb19c9d8047412c17f1dddd6573e2d.json
diff --git a/...ac59090056583849ddc2e6344721758bcc25.json → ...ac59090056583849ddc2e6344721758bcc25.json b/...ac59090056583849ddc2e6344721758bcc25.json → ...ac59090056583849ddc2e6344721758bcc25.json
diff --git a/...2f5341f777bd39dfbcd0e2f4cec4562c877d.json → ...2f5341f777bd39dfbcd0e2f4cec4562c877d.json b/...2f5341f777bd39dfbcd0e2f4cec4562c877d.json → ...2f5341f777bd39dfbcd0e2f4cec4562c877d.json