Move jools tests to integration

Moved tc_jools to integrations test directory
since the requires seem to be what were breaking
the other tests in the unit test suit

test/integration/tc_jools.rb

@@ -4,27 +4,27 @@
 # See the file 'doc/COPYING' for copying permission
 #
 require 'test/unit'
-require '../common/test_constants'
 require '../common/beef_test'
+require '../common/test_constants'
 
 class TC_Jools < Test::Unit::TestCase
-    @@victim = BeefTest.new_victim
 
     #test jools can be acces and a new object can be instantiated
     def test_jools_exists
-        @@victim = BeefTest.new_victim
+        victim = BeefTest.new_victim
         script = "return require('jools');"
-        jools = @@victim.execute_script(script)
+        jools = victim.execute_script(script)
         assert_not_nil jools
         script = "var Jools = require('jools');
         return new Jools([]);"
-        jools_obj = @@victim.execute_script(script)
+        jools_obj = victim.execute_script(script)
         assert_not_nil jools_obj
+        victim.reset_session!
     end
 
     #test simple jools rule example
     def test_jools_simple
-        @@victim = BeefTest.new_victim
+        victim = BeefTest.new_victim
         script = " var Jools = require('jools');
             var rules = [{
             'name':'Lights on after 8pm',
@@ -42,13 +42,13 @@ class TC_Jools < Test::Unit::TestCase
             var j = new Jools(rules);
             var result = j.execute(fact);
             return result.state;"
-       result = @@victim.execute_script(script)
+       result = victim.execute_script(script)
        assert_equal result,'on'
     end
 
     #test jools chaining example
     def test_jools_chaning
-        @@victim = BeefTest.new_victim
+        victim = BeefTest.new_victim
         script = " var Jools = require('jools');
             var rules = [
             {'name':'frog is green',
@@ -104,7 +104,7 @@ class TC_Jools < Test::Unit::TestCase
              results.push(j.execute(fact_3));
              results.push(j.execute(fact_4));
             return results;"
-       results = @@victim.execute_script(script)
+       results = victim.execute_script(script)
        assert_not_nil results
        assert_equal results[0]['color'],'green'
        assert_not_equal results[1]['color'], 'green'

test/integration/ts_integration.rb

@@ -15,6 +15,7 @@ require 'selenium/webdriver'
 require './check_environment' # Basic log in and log out tests
 require './tc_debug_modules' # RESTful API tests (as well as debug modules)
 require './tc_login' # Basic log in and log out tests
+require './tc_jools' # Basic tests for jools
 
 class TS_BeefIntegrationTests
   def self.suite
@@ -23,6 +24,7 @@ class TS_BeefIntegrationTests
     suite << TC_CheckEnvironment.suite
     #suite << TC_DebugModules.suite
     suite << TC_login.suite
+    suite << TC_Jools.suite
 
     return suite
   end

test/unit/ts_unit.rb

@@ -28,7 +28,6 @@ require './extensions/tc_requester'
 require './extensions/tc_event_logger'
 require './tc_grep'
 require './tc_filesystem'
-require './tc_jools'
 
 class TS_BeefTests
   def self.suite
@@ -54,7 +53,6 @@ class TS_BeefTests
     suite << TC_Hackverter.suite
     suite << TC_EventLogger.suite
 	suite << TC_Hooks.suite
-    suite << TC_Jools.suite
 
     return suite
   end