testlab.rb in testlab-0.4.7

- old
+ new

@@ -220,11 +220,11 @@
   #
   # @see TestLab::Provider::PROXY_METHODS
   def method_missing(method_name, *method_args)
     self.ui.logger.debug { "TESTLAB METHOD MISSING: #{method_name.inspect}(#{method_args.inspect})" }
 
-    if TestLab::Provider::PROXY_METHODS.include?(method_name) # || %w(setup teardown).map(&:to_sym).include?(method_name))
+    if TestLab::Provider::PROXY_METHODS.include?(method_name)
       node_method_proxy(method_name, *method_args)
     else
       super(method_name, *method_args)
     end
   end
@@ -233,11 +233,11 @@
   #
   # These are special methods that we both include and extend on the parent
   # class.
   module DualMethods
 
-    @@ui ||= nil
+    @@ui = nil
 
     # Get Test Lab User Interface
     #
     # Returns the instance of ZTK:UI the lab is using for its user interface.
     #
@@ -282,9 +282,9 @@
       [executable, args].flatten.compact.join(' ')
     end
 
   end
 
-  include TestLab::DualMethods
   extend  TestLab::DualMethods
+  include TestLab::DualMethods
 
 end