From c564323c04be49deb4c8d220a72476f733b04e96 Mon Sep 17 00:00:00 2001
From: hardya <hardya@248e525c-4dfb-0310-94bc-949c084e9493>
Date: Wed, 27 Feb 2008 18:26:09 +0000
Subject: [PATCH] Apply changes before uploading file.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3738 248e525c-4dfb-0310-94bc-949c084e9493
---
 tests/enquirytests.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/enquirytests.rb b/tests/enquirytests.rb
index d764d9c..fd75f5e 100644
--- a/tests/enquirytests.rb
+++ b/tests/enquirytests.rb
@@ -766,8 +766,8 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_FIRST_CONTACT_FAX').set '123456789'
     @@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').set 'jamie.priest@advanticagroup.com'
     @@ie.button(:value, 'Save').click
-    @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))    
+    @@ie.wait 
+    assert_nil(@@ie.contains_text('Error'),'Error found (__LINE__) '+geterrormess(@@ie))    
     assert_equal(false,@@ie.button(:value, 'Save').exists?,'Found Save button when it should have been hidden')
     assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find an Apply Changes button')    
     assert(@@ie.button(:value, 'Cancel').exists?,'Could not find a Cancel button')  
@@ -811,19 +811,22 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_OTHER_INFORMATION').set ''
     #@@ie.text_field(:id,'P32_EXISTING_LOGGER').set ''
     #@@ie.text_field(:id,'P32_EXISTING_CONVERTOR').set ''
-    @@ie.button(:value, 'Upload File')
+    @@ie.button(:value, 'Apply Changes').click
+    @@ie.wait
+    
+    @@ie.button(:value, 'Upload File').click
     @@ie.wait
     #check fileupload via upload control on enquiry form
     #we know InstallMIP.cmd is around
     @@ie.file_field(:id, 'P41_FILE_UPLOAD').set(WORKINGDIR+'\\InstallMIP.cmd')
     @@ie.button(:value, 'Upload').click    
     @@ie.wait
-    
-    assert_nil(@@ie.contains_text('Error'),'Error found >'+geterrormess(@@ie))
+
+    assert_nil(@@ie.contains_text('Error'),'Error found (__LINE__) '+geterrormess(@@ie))
     @@ie.button(:value, 'Request Quotation').click    
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))
-    assert_nil(@@ie.contains_text('error'),'Error found '+geterrormess(@@ie))  
+    assert_nil(@@ie.contains_text('Error'),'Error found (__LINE__) '+geterrormess(@@ie))
+    assert_nil(@@ie.contains_text('error'),'Error found (__LINE__) '+geterrormess(@@ie))  
   end  
 
   def test_24_find_saved_quote