fixes #15

- test suite annotation was not resetting ignore and solo annotations
rokucommunity · Oct 1, 2018 · e9f42a4 · e9f42a4
1 parent 91871e9
commit e9f42a4
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/samples/Overview/source/rooibos.cat.brs b/samples/Overview/source/rooibos.cat.brs
@@ -2142,12 +2142,14 @@ function RBS_TS_ProcessSuite(maxLinesWithoutSuiteDirective, supportLegacyTests )
         if (isNextTokenNodeTest)
           m.nodeTestFileName = nodeTestFileName
           m.isNodeTest = true
-          isNextTokenNodeTest = false
         end if
         if (isNextTokenIgnore)
           m.isIgnored = true
           goto exitProcessing
         end if
+        isNextTokenSolo = false
+        isNextTokenIgnore = false
+        isNextTokenNodeTest = false
         goto exitLoop
       else if (RBS_TS_IsTag(line, TAG_IT))
         if (not isTestSuite)

diff --git a/source/buildinfo.brs b/source/buildinfo.brs
@@ -1,6 +1,6 @@
 Function BuildDate()
-  return "Oct 1 2018 19:18:59"
+  return "Oct 1 2018 19:28:58"
 End Function
 Function BuildCommit()
-  return "5f16d0f"
+  return "91871e9"
 End Function
diff --git a/source/rooibos.cat.brs b/source/rooibos.cat.brs
@@ -2142,12 +2142,14 @@ function RBS_TS_ProcessSuite(maxLinesWithoutSuiteDirective, supportLegacyTests )
         if (isNextTokenNodeTest)
           m.nodeTestFileName = nodeTestFileName
           m.isNodeTest = true
-          isNextTokenNodeTest = false
         end if
         if (isNextTokenIgnore)
           m.isIgnored = true
           goto exitProcessing
         end if
+        isNextTokenSolo = false
+        isNextTokenIgnore = false
+        isNextTokenNodeTest = false
         goto exitLoop
       else if (RBS_TS_IsTag(line, TAG_IT))
         if (not isTestSuite)

diff --git a/source/tests/issue_15_tests_only_on_groups.brs b/source/tests/issue_15_tests_only_on_groups.brs
@@ -0,0 +1,30 @@
+'ADD '@Only ON NEXT LINE TO TEST
+'@TestSuite [RBSA] Rooibos before after tests
+
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+'@It tests one
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+'@Test it one
+function RBSA__it_test_one() as void
+    m.AssertTrue(true)
+end function
+
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+'@It tests two
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+'@Test it two
+function RBSA__it_test_two() as void
+    m.AssertTrue(true)
+end function
+
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+'ADD '@Only ON NEXT LINE TO TEST
+'@It tests three
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+'@Test it three
+function RBSA__it_test_three() as void
+    m.AssertTrue(true)
+end function
diff --git a/src/Rooibos_TestSuite.brs b/src/Rooibos_TestSuite.brs
@@ -95,14 +95,17 @@ function RBS_TS_ProcessSuite(maxLinesWithoutSuiteDirective, supportLegacyTests )
         if (isNextTokenNodeTest)
           m.nodeTestFileName = nodeTestFileName
           m.isNodeTest = true
-          isNextTokenNodeTest = false
         end if
 
         if (isNextTokenIgnore)
           m.isIgnored = true
           goto exitProcessing
         end if
-
+
+        isNextTokenSolo = false
+        isNextTokenIgnore = false
+        isNextTokenNodeTest = false
+
         goto exitLoop
       else if (RBS_TS_IsTag(line, TAG_IT))
         if (not isTestSuite)