Do not execute describe if it is filtered out

This prevents describes that have been filtered out, with the
--exclude-tags or --filter-out options, from running any setup or
teardown functions.

Author: o-lim

busted/runner.lua

@@ -248,9 +248,8 @@ return function(options)
   end
 
   local filterExcludeTags = function(name)
-    local fullname = getFullName(name)
     for i, tag in pairs(excludeTags) do
-      if hasTag(fullname, tag) then
+      if hasTag(name, tag) then
         return nil, false
       end
     end
@@ -307,10 +306,10 @@ return function(options)
   end
 
   -- The following filters are applied in reverse order
-  applyFilter({ 'it', 'pending' }, 'filter'      , filterNames      )
-  applyFilter({ 'it', 'pending' }, 'filter-out'  , filterOutNames   )
-  applyFilter({ 'it', 'pending' }, 'tags'        , filterTags       )
-  applyFilter({ 'it', 'pending' }, 'exclude-tags', filterExcludeTags)
+  applyFilter({ 'it', 'pending' }            , 'filter'      , filterNames      )
+  applyFilter({ 'describe', 'it', 'pending' }, 'filter-out'  , filterOutNames   )
+  applyFilter({ 'it', 'pending' }            , 'tags'        , filterTags       )
+  applyFilter({ 'describe', 'it', 'pending' }, 'exclude-tags', filterExcludeTags)
 
   -- Load test directory
   local rootFile = cliArgs.ROOT and normpath(path.join(fpath, cliArgs.ROOT)) or fileName

spec/cl_filter.lua

@@ -43,7 +43,7 @@ describe('Tests describe with patt1', function()
 end)
 
 context('Tests context with patt2', function()
-  it('is a test inside context', function()
-    error('error on patt2')
+  setup(function()
+    error('error in setup on patt2')
   end)
 end)

spec/cl_spec.lua

@@ -67,10 +67,10 @@ describe('Tests the busted command-line options', function()
     assert.is_equal(8, exitcode)
     success, exitcode = execute('bin/busted --pattern=_tags.lua$ --tags=tag1')
     assert.is_false(success)
-    assert.is_equal(2, exitcode)
+    assert.is_equal(3, exitcode)
     success, exitcode = execute('bin/busted --pattern=_tags.lua$ --tags=tag1,tag2')
     assert.is_false(success)
-    assert.is_equal(3, exitcode)
+    assert.is_equal(4, exitcode)
     error_end()
   end)
 
@@ -93,8 +93,8 @@ describe('Tests the busted command-line options', function()
     assert.is_false(success)
     assert.is_equal(1, exitcode)
     success, exitcode = execute('bin/busted --pattern=_tags.lua$ --tags=tag3 --exclude-tags=tag4')
-    assert.is_true(success)
-    assert.is_equal(0, exitcode)
+    assert.is_false(success)
+    assert.is_equal(1, exitcode)
     error_end()
   end)
 
@@ -103,7 +103,7 @@ describe('Tests the busted command-line options', function()
     error_start()
     success, exitcode = execute('bin/busted --pattern=_tags.lua$ --tags=dtag1')
     assert.is_false(success)
-    assert.is_equal(4, exitcode)
+    assert.is_equal(5, exitcode)
     success, exitcode = execute('bin/busted --pattern=_tags.lua$ --tags=dtag2')
     assert.is_false(success)
     assert.is_equal(1, exitcode)
@@ -118,10 +118,10 @@ describe('Tests the busted command-line options', function()
     assert.is_equal(8, exitcode)
     success, exitcode = execute('bin/busted --pattern=_filter.lua$ --filter="pattern1"')
     assert.is_false(success)
-    assert.is_equal(2, exitcode)
+    assert.is_equal(3, exitcode)
     success, exitcode = execute('bin/busted --pattern=_filter.lua$ --filter="pattern2"')
     assert.is_false(success)
-    assert.is_equal(1, exitcode)
+    assert.is_equal(2, exitcode)
     error_end()
   end)
 
@@ -152,7 +152,7 @@ describe('Tests the busted command-line options', function()
     error_start()
     success, exitcode = execute('bin/busted --pattern=_filter.lua$ --filter="patt1"')
     assert.is_false(success)
-    assert.is_equal(4, exitcode)
+    assert.is_equal(5, exitcode)
     success, exitcode = execute('bin/busted --pattern=_filter.lua$ --filter="patt2"')
     assert.is_false(success)
     assert.is_equal(1, exitcode)

spec/cl_tags.lua

@@ -43,7 +43,7 @@ describe('Tests describe with a tag #dtag1', function()
 end)
 
 context('Tests context with a tag #dtag2', function()
-  it('is a test inside context', function()
-    error('error on dtag2')
+  setup(function()
+    error('error in setup on dtag2')
   end)
 end)