From bc4be9711ff02d8c06f41c5023b310af371ab41d Mon Sep 17 00:00:00 2001 From: PriestJ Date: Mon, 3 Mar 2008 11:56:05 +0000 Subject: [PATCH] fixed more tests after changes of the last few weeks git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3807 248e525c-4dfb-0310-94bc-949c084e9493 --- tests/addontests.rb | 2 +- tests/basestests.rb | 2 +- tests/drawingtests.rb | 2 +- tests/moduletests.rb | 4 ++-- tests/start.rb | 3 ++- tests/user_management.rb | 10 +++++----- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/addontests.rb b/tests/addontests.rb index 53456f7..cb4a6b4 100644 --- a/tests/addontests.rb +++ b/tests/addontests.rb @@ -121,7 +121,7 @@ class Test_06_addon_screen < Test::Unit::TestCase assert(@@ie.button(:id, 'cancel').exists?,'The cancel button was not available') assert(@@ie.button(:id, 'delete').exists?,'The delete button was not available') assert(@@ie.button(:id, 'apply_changes').exists?,'The Apply Changes button was not available') - assert(@@ie.hidden(:id, 'P24_CODE').exits?,'The CODE field was not hidden') + assert(@@ie.hidden(:id, 'P24_CODE').exists?,'The CODE field was not hidden') assert(@@ie.contains_text('Create/Edit Additional Item'),'The additional item screen did not appear') assert(@@ie.contains_text('ADDON3'),'The record with additional item code ADDON3 did not appear') end diff --git a/tests/basestests.rb b/tests/basestests.rb index a567b5f..0f2dd36 100644 --- a/tests/basestests.rb +++ b/tests/basestests.rb @@ -281,7 +281,6 @@ class Test_05_base_screen < Test::Unit::TestCase @@ie.select_list(:id, 'P51_DRWG_CODE').select('WI') @@ie.button(:id, 'create').click @@ie.wait - assert_nil(@@ie.contains_text('Bases'),'The base screen did appear') assert_nil(@@ie.contains_text('1765BH1'),'The new record with base code 1765BH1 did appear') assert_nil(@@ie.contains_text('Base for meters'),'The description Base for meters did appear') assert_nil(@@ie.contains_text('3800'),'The value 3800 for Dim A did appear') @@ -295,6 +294,7 @@ class Test_05_base_screen < Test::Unit::TestCase assert_nil(@@ie.contains_text('2400'),'The value 2400 for Dim I did appear') assert_nil(@@ie.contains_text('WI'),'The new record with drawing code WI did appear') assert(@@ie.contains_text('Error'),'An error was not generated') + assert(@@ie.contains_text('Attempting to create a duplicate Bases entry'),'Did not find expected error message') sleep 3 @@ie.link(:text, 'OK').click @@ie.wait diff --git a/tests/drawingtests.rb b/tests/drawingtests.rb index 4c99628..10c8c6f 100644 --- a/tests/drawingtests.rb +++ b/tests/drawingtests.rb @@ -156,7 +156,7 @@ class Test_04_drawings_screen < Test::Unit::TestCase @@ie.button(:id, 'create').click @@ie.wait assert(@@ie.contains_text('Error'),'An error was not generated') - assert(@@ie.contains_text('ORA-00001: unique constraint (MIP_TEST.DRWG_PK) violated'),'Expected a nasty oracle error message(ORA-00001) but did not get it') + assert(@@ie.contains_text('Attempting to create a duplicate Drawings entry'),'Expected a nice error message but did not get it') end # end \ No newline at end of file diff --git a/tests/moduletests.rb b/tests/moduletests.rb index 02086da..80b2cb6 100644 --- a/tests/moduletests.rb +++ b/tests/moduletests.rb @@ -64,7 +64,7 @@ class Test_08_modules_screen < Test::Unit::TestCase # def test_03_create_module @@ie.text_field(:id, 'P57_CODE').set('AR10266H') - @@ie.text_field(:id, 'P57_METR_CODE').set('MRD1600B4F') + @@ie.select_list(:id, 'P57_METR_CODE').set('MRD1600B4F') @@ie.select_list(:id, 'P57_FLTR_CODE').select('Gauze - 100') @@ie.select_list(:id, 'P57_REGU_CODE').select('J48 - 30') @@ie.select_list(:id, 'P57_REVA_CODE').select('10L: Size 25: Setting 35') @@ -99,7 +99,7 @@ class Test_08_modules_screen < Test::Unit::TestCase @@ie.button(:id, 'create').click @@ie.wait @@ie.text_field(:id, 'P57_CODE').set('AR12265H') - @@ie.text_field(:id, 'P57_METR_CODE').set('MRD1600B4F') + @@ie.select_list(:id, 'P57_METR_CODE').set('MRD1600B4F') @@ie.select_list(:id, 'P57_FLTR_CODE').select('Gauze - 100') @@ie.select_list(:id, 'P57_REGU_CODE').select('J48 - 30') @@ie.select_list(:id, 'P57_REVA_CODE').select('10L: Size 25: Setting 35') diff --git a/tests/start.rb b/tests/start.rb index aa623ae..edb2e46 100644 --- a/tests/start.rb +++ b/tests/start.rb @@ -39,7 +39,8 @@ include Watir #require 'exportdatatests' #require 'enquirytests' #require 'housingtests' -require 'basestests' +#require 'basestests' #require 'drawingtests.rb' +require 'user_management.rb' #@@ie.wait #@@ie.close \ No newline at end of file diff --git a/tests/user_management.rb b/tests/user_management.rb index 70d415c..fdfd8bc 100644 --- a/tests/user_management.rb +++ b/tests/user_management.rb @@ -176,7 +176,7 @@ class Test_09_MIPADMIN_party_management< Test::Unit::TestCase @@ie.text_field(:id,'P63_OFF_BUILDING').set('Supplier1') @@ie.text_field(:id,'P63_OFF_STREET').set('A Street') @@ie.text_field(:id,'P63_OFF_CITY').set('Supplier City') - @@ie.text_field(:id,'P63_OFF_POSTCODE').set('SU1 1SU') + @@ie.text_field(:id,'P63_OFF_POSTCODE').set('LE11 3GR') @@ie.button(:value,'Next >').click #wont bother setting a home address as we don't need to so we'll create the supplier @@ -350,7 +350,7 @@ class Test_09_MIPADMIN_party_management< Test::Unit::TestCase @@ie.text_field(:id,'P63_OFF_BUILDING').set('Metering House') @@ie.text_field(:id,'P63_OFF_STREET').set('Meter Road') @@ie.text_field(:id,'P63_OFF_CITY').set('Meter City') - @@ie.text_field(:id,'P63_OFF_POSTCODE').set('ME1 1ME') + @@ie.text_field(:id,'P63_OFF_POSTCODE').set('LE11 3GR') @@ie.button(:value,'Next >').click @@ie.wait @@ -409,7 +409,7 @@ class Test_09_MIPADMIN_party_management< Test::Unit::TestCase @@ie.text_field(:id,'P63_OFF_BUILDING').set('Metering House') @@ie.text_field(:id,'P63_OFF_STREET').set('Meter Road') @@ie.text_field(:id,'P63_OFF_CITY').set('Meter City') - @@ie.text_field(:id,'P63_OFF_POSTCODE').set('ME2 2ME') + @@ie.text_field(:id,'P63_OFF_POSTCODE').set('LE11 3GR') @@ie.button(:value,'Next >').click @@ie.wait @@ -464,7 +464,7 @@ class Test_09_MIPADMIN_party_management< Test::Unit::TestCase @@ie.text_field(:id,'P63_OFF_BUILDING').set('Manufacturer1') @@ie.text_field(:id,'P63_OFF_STREET').set('A Street') @@ie.text_field(:id,'P63_OFF_CITY').set('Manufacturer City') - @@ie.text_field(:id,'P63_OFF_POSTCODE').set('MA1 1MA') + @@ie.text_field(:id,'P63_OFF_POSTCODE').set('LE11 3GR') @@ie.button(:value,'Next >').click @@ie.wait @@ -709,7 +709,7 @@ class Test_11_edit_parties< Test::Unit::TestCase @@ie.text_field(:id,'P69_ADDR_BUILDING').set('Building 2') @@ie.text_field(:id,'P69_ADDR_STREET').set('Supplier Street') @@ie.text_field(:id,'P69_ADDR_CITY').set('Supplierton') - @@ie.text_field(:id,'P69_ADDR_POSTCODE').set('SU1 2SU') + @@ie.text_field(:id,'P69_ADDR_POSTCODE').set('LE11 3GR') @@ie.button(:value,'Save').click @@ie.wait @@ie.button(:value,'Apply Changes').click