Clean up globals

fwalch · Aug 15, 2014 · 75c19a8 · 75c19a8
1 parent 6510e55
commit 75c19a8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/bin/busted b/bin/busted
@@ -140,7 +140,7 @@ local outputHandlerOptions = {
   deferPrint = cliArgs['defer-print']
 }
 
-outputHandler = outputHandlerLoader(cliArgs.output, cliArgs.o, outputHandlerOptions, busted)
+local outputHandler = outputHandlerLoader(cliArgs.output, cliArgs.o, outputHandlerOptions, busted)
 outputHandler:subscribe(outputHandlerOptions)
 
 if cliArgs.s then

diff --git a/busted/modules/files/lua.lua b/busted/modules/files/lua.lua
@@ -16,7 +16,7 @@ end
 
 
 ret.load = function(busted, filename)
-  local file
+  local file, err
 
   local success, err = pcall(function()
     file, err = loadfile(filename)

diff --git a/busted/outputHandlers/TAP.lua b/busted/outputHandlers/TAP.lua
@@ -11,7 +11,6 @@ return function(options, busted)
     while parent and (parent.name or parent.descriptor) and
           parent.descriptor ~= 'file' do
 
-      current_context = context.parent
       table.insert(names, 1, parent.name or parent.descriptor)
       parent = busted.context.parent(parent)
     end

diff --git a/busted/outputHandlers/junit.lua b/busted/outputHandlers/junit.lua
@@ -44,10 +44,6 @@ return function(options, busted)
   end
 
   handler.error = function(element, parent, message, trace)
-    if status == 'failure' then
-      node.attr.errors = node.attr.errors + 1
-    end
-
     node:addtag('failure', {
       message = message
     }):text(trace.traceback):up()