From d7ba74e6c3c2cdb50b9fefdfb1e28a8247443963 Mon Sep 17 00:00:00 2001
From: kanagad <kanagad@248e525c-4dfb-0310-94bc-949c084e9493>
Date: Fri, 9 Jan 2009 13:17:59 +0000
Subject: [PATCH] updated with latest files

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@8969 248e525c-4dfb-0310-94bc-949c084e9493
---
 tests/default_methods.rb | 14 +++++++-------
 tests/start.rb           | 12 ++++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tests/default_methods.rb b/tests/default_methods.rb
index 81040f2..fd30a12 100644
--- a/tests/default_methods.rb
+++ b/tests/default_methods.rb
@@ -1,6 +1,6 @@
 # Oracle stuff
 #
-require 'oci8'
+#require 'oci8'
 #used to handle javascript popups
 require 'watir/contrib/enabled_popup'
 require 'watir/WindowHelper'
@@ -24,13 +24,13 @@ end
 #
 # DOSQL
 #  
-def dosql(p_sql)
-  conn = OCI8.new(DBUSERNAME,DBPASSWORD,DATABASE)
-  #conn.exec('begin DELETE_TEST_DATA; end;')
-  puts p_sql
-  conn.exec(p_sql)
+#def dosql(p_sql)
+ # conn = OCI8.new(DBUSERNAME,DBPASSWORD,DATABASE)
+  ##conn.exec('begin DELETE_TEST_DATA; end;')
+  #puts p_sql
+  #conn.exec(p_sql)
   #conn.exec('commit;')
-end
+#end
 
 #
 #LOGIN
diff --git a/tests/start.rb b/tests/start.rb
index edb2e46..5c4fdfc 100644
--- a/tests/start.rb
+++ b/tests/start.rb
@@ -9,8 +9,6 @@ require 'default_methods.rb'
 
 #includes
 include Watir
-
-
 @@ie = IE.new
 @@ie.maximize
 #set the speed of watir, we'd also set the speed of light but that's supposed to be a constant
@@ -36,11 +34,21 @@ include Watir
 #
 #Get our individual integration tests
 #
+<<<<<<< .mine
+#require 'exportdatatests'
+#require 'drawingtests'
+#require 'housingtests'
+#require 'moduletests'
+#require 'basestests'
+#require 'addontests'
+require 'quote_reports'
+=======
 #require 'exportdatatests'
 #require 'enquirytests'
 #require 'housingtests'
 #require 'basestests'
 #require 'drawingtests.rb'
 require 'user_management.rb'
+>>>>>>> .r3436
 #@@ie.wait
 #@@ie.close
\ No newline at end of file