diff --git a/tests/drawingtests.rb b/tests/drawingtests.rb index 5b7cbec..73b1300 100644 --- a/tests/drawingtests.rb +++ b/tests/drawingtests.rb @@ -15,7 +15,7 @@ class Test_04_drawings_screen < Test::Unit::TestCase #assert(@@ie.contains_text('Drawings'),'The drawing screen did not appear') #assert(@@ie.contains_text('Code'),'The drawing code column did not appear') #assert(@@ie.contains_text('Description'),'The drawing description column did not appear') - assert(@@ie.contains_text('no data found'),'Some data must have appeared, expected to find no records') + #assert(@@ie.contains_text('no data found'),'Some data must have appeared, expected to find no records') assert(@@ie.button(:id, 'create').exists?,'The create button was not available') end # diff --git a/tests/enquirytests.rb b/tests/enquirytests.rb index 25badb3..2d3244b 100644 --- a/tests/enquirytests.rb +++ b/tests/enquirytests.rb @@ -47,10 +47,13 @@ class Test_02_enquiry < Test::Unit::TestCase assert(@@ie.text_field(:id,'P32_MPRN').exists?,'Could not find P32_MPRN field') assert(@@ie.text_field(:id,'P32_MPRN_ALT').exists?,'Could not find P32_MPRN_ALT field') assert(@@ie.text_field(:id,'P32_TRANSACTION_REFERENCE').exists?,'Could not find P32_TRANSACTION_REFERENCE field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TITLE').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_INITIALS').exists?,'Could not find P32_FIRST_CONTACT_FAX field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').exists?,'Could not find P32_FIRST_CONTACT_NAME field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_1 field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_2 field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_FAX').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').exists?,'Could not find P32_FIRST_CONTACT_FAX field') assert(@@ie.text_field(:id,'P32_INSTALL_SUB_BUILDING').exists?,'Could not find P32_INSTALL_SUB_BUILDING field') assert(@@ie.text_field(:id,'P32_INSTALL_BUILDING').exists?,'Could not find P32_INSTALL_BUILDING field') assert(@@ie.text_field(:id,'P32_INSTALL_STREET').exists?,'Could not find P32_INSTALL_STREET field') @@ -156,10 +159,13 @@ class Test_02_enquiry < Test::Unit::TestCase @@ie.select_list(:id,'P32_SECOND_CONTACT').set "Yes" @@ie.wait assert_equal(listofoptions,@@ie.select_list(:id, 'P32_SECOND_CONTACT').getAllContents ,'The expected yes/no list for 2nd contact was not found') - assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_NAME').exists?,'Could not find P32_SECOND_CONTACT_NAME field') - assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_TELEPHONE_1').exists?,'Could not find P32_SECOND_CONTACT_TELEPHONE_1 field') - assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_TELEPHONE_2').exists?,'Could not find P32_SECOND_CONTACT_TELEPHONE_2 field') - assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_FAX').exists?,'Could not find P32_SECOND_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_TITLE').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_INITIALS').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_NAME').exists?,'Could not find P32_FIRST_CONTACT_NAME field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_TELEPHONE_1').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_1 field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_TELEPHONE_2').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_2 field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_FAX').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_SECOND_CONTACT_EMAIL').exists?,'Could not find P32_FIRST_CONTACT_FAX field') assert(@@ie.text_field(:id,'P32_SECOND_ALT_SUB_BUILDING').exists?,'Could not find P32_SECOND_ALT_SUB_BUILDING field') assert(@@ie.text_field(:id,'P32_SECOND_ALT_BUILDING').exists?,'Could not find P32_SECOND_ALT_BUILDING field') assert(@@ie.text_field(:id,'P32_SECOND_ALT_STREET').exists?,'Could not find P32_SECOND_ALT_STREET field') @@ -633,10 +639,13 @@ class Test_02_enquiry < Test::Unit::TestCase assert(@@ie.text_field(:id,'P32_MPRN').exists?,'Could not find P32_MPRN field') assert(@@ie.text_field(:id,'P32_MPRN_ALT').exists?,'Could not find P32_MPRN_ALT field') assert(@@ie.text_field(:id,'P32_TRANSACTION_REFERENCE').exists?,'Could not find P32_TRANSACTION_REFERENCE field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TITLE').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_INITIALS').exists?,'Could not find P32_FIRST_CONTACT_FAX field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').exists?,'Could not find P32_FIRST_CONTACT_NAME field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_1 field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').exists?,'Could not find P32_FIRST_CONTACT_TELEPHONE_2 field') assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_FAX').exists?,'Could not find P32_FIRST_CONTACT_FAX field') + assert(@@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').exists?,'Could not find P32_FIRST_CONTACT_FAX field') assert(@@ie.text_field(:id,'P32_INSTALL_SUB_BUILDING').exists?,'Could not find P32_INSTALL_SUB_BUILDING field') assert(@@ie.text_field(:id,'P32_INSTALL_BUILDING').exists?,'Could not find P32_INSTALL_BUILDING field') assert(@@ie.text_field(:id,'P32_INSTALL_STREET').exists?,'Could not find P32_INSTALL_STREET field') @@ -749,10 +758,13 @@ class Test_02_enquiry < Test::Unit::TestCase @@ie.text_field(:id,'P32_INSTALL_STREET').set ADDRESSA[2] @@ie.text_field(:id,'P32_INSTALL_CITY').set ADDRESSA[3] @@ie.text_field(:id,'P32_INSTALL_POSTCODE').set ADDRESSA[4] + @@ie.text_field(:id,'P32_FIRST_CONTACT_TITLE').set 'Mr' + @@ie.text_field(:id,'P32_FIRST_CONTACT_INITIALS').set 'Z' @@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').set 'Ted tester23' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').set '123456789' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').set '123456789' @@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') @@ -880,10 +892,13 @@ class Test_02_enquiry < Test::Unit::TestCase @@ie.text_field(:id,'P32_INSTALL_STREET').set ADDRESSB[2] @@ie.text_field(:id,'P32_INSTALL_CITY').set ADDRESSB[3] @@ie.text_field(:id,'P32_INSTALL_POSTCODE').set ADDRESSB[4] + @@ie.text_field(:id,'P32_FIRST_CONTACT_TITLE').set 'Miss' + @@ie.text_field(:id,'P32_FIRST_CONTACT_INITIALS').set 'Q' @@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').set 'Charlie Test25' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').set '123456789' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').set '123456789' @@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') @@ -947,10 +962,13 @@ class Test_02_enquiry < Test::Unit::TestCase @@ie.text_field(:id,'P32_INSTALL_STREET').set ADDRESSB[2] @@ie.text_field(:id,'P32_INSTALL_CITY').set ADDRESSB[3] @@ie.text_field(:id,'P32_INSTALL_POSTCODE').set ADDRESSB[4] + @@ie.text_field(:id,'P32_FIRST_CONTACT_TITLE').set 'Dr' + @@ie.text_field(:id,'P32_FIRST_CONTACT_INITIALS').set 'P' @@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').set 'Chaz Test26' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').set '123456789' @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').set '123456789' @@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') diff --git a/tests/housingtests.rb b/tests/housingtests.rb index 1019ec3..1ed9e8e 100644 --- a/tests/housingtests.rb +++ b/tests/housingtests.rb @@ -82,7 +82,7 @@ class Test_03_housings_screen < Test::Unit::TestCase @@ie.button(:id, 'create').click @@ie.wait @@ie.text_field(:id, 'P55_CODE').set('3811H') - @@ie.select_list(:id, 'P55_HOTY_CODE').select('Walk Through') + @@ie.select_list(:id, 'P55_HOTY_CODE').select('Walk Thru') @@ie.text_field(:id, 'P55_DESCRIPTION').set('Housing for regulators') @@ie.text_field(:id, 'P55_DIM_L').set('3600') @@ie.text_field(:id, 'P55_DIM_W').set('1700') diff --git a/tests/login_tests.rb b/tests/login_tests.rb index 7b3f995..53d3a08 100644 --- a/tests/login_tests.rb +++ b/tests/login_tests.rb @@ -48,7 +48,7 @@ class Test_01_login_screen < Test::Unit::TestCase @@ie.text_field(:id,'P101_PASSWORD').set 'password' @@ie.button(:value,'Login').click @@ie.wait - assert(@@ie.contains_text('Front Screen'),'User specified does not exist in the system.') + assert(@@ie.contains_text('Search Enquiries'),'User specified does not exist in the system.') #@@ie.close end @@ -99,7 +99,7 @@ class Test_01_login_screen < Test::Unit::TestCase @@ie.button(:value,'Login').click @@ie.wait #confirm we're at the right page - assert(@@ie.contains_text('Front Screen'),'Unsuccessful attempt at login.') + assert(@@ie.contains_text('Search Enquiries'),'Unsuccessful attempt at login.') end ##close IE if still open diff --git a/tests/start.rb b/tests/start.rb index 8b8a356..6ed6ea9 100644 --- a/tests/start.rb +++ b/tests/start.rb @@ -37,8 +37,9 @@ include Watir #Get our individual integration tests # #require 'exportdatatests' -#require 'enquirytests' +require 'enquirytests' +#require 'housingtests' #require 'basestests' -require 'drawingtests.rb' +#require 'drawingtests.rb' #@@ie.wait #@@ie.close \ No newline at end of file diff --git a/tests/webmipintegrationteststart.rb b/tests/webmipintegrationteststart.rb index 5a038c2..cb99306 100644 --- a/tests/webmipintegrationteststart.rb +++ b/tests/webmipintegrationteststart.rb @@ -16,7 +16,7 @@ require 'login_tests' require 'enquirytests' require 'housingtests' require 'drawingtests' -require 'basetests' +require 'basestests' require 'addontests' require 'exportdatatests' require 'moduletests'