Removed not needed checks.

This commit is contained in:
Martin Edenhofer 2014-12-01 22:57:55 +01:00
parent 1d929159ba
commit 26c9115875
3 changed files with 98 additions and 110 deletions

View file

@ -150,12 +150,6 @@ class AaaGettingStartedTest < TestCase
:execute => 'click', :execute => 'click',
:css => '.js-intro .btn--primary', :css => '.js-intro .btn--primary',
}, },
{
:execute => 'watch_for',
:area => 'body',
:value => 'testing',
:timeout => 60,
},
{ {
:execute => 'watch_for', :execute => 'watch_for',
:area => 'body', :area => 'body',
@ -284,11 +278,6 @@ class AaaGettingStartedTest < TestCase
:execute => 'click', :execute => 'click',
:css => '.js-intro .btn--primary', :css => '.js-intro .btn--primary',
}, },
{
:execute => 'watch_for',
:area => 'body',
:value => 'testing',
},
{ {
:execute => 'watch_for', :execute => 'watch_for',
:area => 'body', :area => 'body',
@ -366,11 +355,6 @@ class AaaGettingStartedTest < TestCase
:execute => 'click', :execute => 'click',
:css => '.js-intro .btn--primary', :css => '.js-intro .btn--primary',
}, },
{
:execute => 'watch_for',
:area => '.js-probe',
:value => 'testing',
},
{ {
:execute => 'watch_for', :execute => 'watch_for',
:area => '.js-inbound h2', :area => '.js-inbound h2',

View file

@ -6,15 +6,15 @@ class AgentTicketActionsLevel2Test < TestCase
message = 'message 1äöüß ' + rand(99999999999999999).to_s message = 'message 1äöüß ' + rand(99999999999999999).to_s
tests = [ tests = [
{ {
:name => 'start', :name => 'start',
:instance1 => browser_instance, :instance1 => browser_instance,
:instance2 => browser_instance, :instance2 => browser_instance,
:instance1_username => 'master@example.com', :instance1_username => 'master@example.com',
:instance1_password => 'test', :instance1_password => 'test',
:instance2_username => 'agent1@example.com', :instance2_username => 'agent1@example.com',
:instance2_password => 'test', :instance2_password => 'test',
:url => browser_url, :url => browser_url,
:action => [ :action => [
{ {
:where => :instance1, :where => :instance1,
:execute => 'close_all_tasks', :execute => 'close_all_tasks',
@ -102,14 +102,14 @@ class AgentTicketActionsLevel2Test < TestCase
# change task and page title in second browser # change task and page title in second browser
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_task_attributes', :execute => 'verify_task_attributes',
:title => 'TTTsome level 2 <b>subject</b> 123äöü', :title => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance2, :where => :instance2,
:element => :title, :element => :title,
:value => 'TTTsome level 2 <b>subject</b> 123äöü', :value => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
# change task and page title in first browser # change task and page title in first browser
@ -118,36 +118,36 @@ class AgentTicketActionsLevel2Test < TestCase
:value => 10, :value => 10,
}, },
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:title => 'TTTsome level 2 <b>subject</b> 123äöü', :title => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_task_attributes', :execute => 'verify_task_attributes',
:title => 'TTTsome level 2 <b>subject</b> 123äöü', :title => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance1, :where => :instance1,
:element => :title, :element => :title,
:value => 'TTTsome level 2 <b>subject</b> 123äöü', :value => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance2, :where => :instance2,
:element => :title, :element => :title,
:value => 'TTTsome level 2 <b>subject</b> 123äöü', :value => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
# verify text in input body # verify text in input body
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => 'some level 2 <b>body</b> in instance 1', :body => 'some level 2 <b>body</b> in instance 1',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => 'some level 2 <b>body</b> in instance 2', :body => 'some level 2 <b>body</b> in instance 2',
}, },
# add new article # add new article
@ -170,30 +170,34 @@ class AgentTicketActionsLevel2Test < TestCase
{ {
:where => :instance1, :where => :instance1,
:execute => 'watch_for', :execute => 'watch_for',
:area => 'body', :area => '.active div.ticket-article',
:value => 'some update 4711', :value => 'some update 4711',
}, },
# verify empty text in input body # verify empty text in input body
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => 'some level 2 <b>body</b> in instance 2', :body => 'some level 2 <b>body</b> in instance 2',
},
{
:execute => 'wait',
:value => 2,
}, },
# reload instances, verify again # reload instances, verify again
{ {
:where => :instance1, :where => :instance1,
:execute => 'reload', :execute => 'reload',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'reload', :execute => 'reload',
}, },
# wait till application become ready # wait till application become ready
@ -202,24 +206,24 @@ class AgentTicketActionsLevel2Test < TestCase
:value => 8, :value => 8,
}, },
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:title => 'TTTsome level 2 <b>subject</b> 123äöü', :title => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_task_attributes', :execute => 'verify_task_attributes',
:title => 'TTTsome level 2 <b>subject</b> 123äöü', :title => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance1, :where => :instance1,
:element => :title, :element => :title,
:value => 'TTTsome level 2 <b>subject</b> 123äöü', :value => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
{ {
:where => :instance2, :where => :instance2,
:element => :title, :element => :title,
:value => 'TTTsome level 2 <b>subject</b> 123äöü', :value => 'TTTsome level 2 <b>subject</b> 123äöü',
}, },
# verify update # verify update
@ -240,14 +244,14 @@ class AgentTicketActionsLevel2Test < TestCase
# verify empty text in input body # verify empty text in input body
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => 'some level 2 <b>body</b> in instance 2', :body => 'some level 2 <b>body</b> in instance 2',
}, },
], ],

View file

@ -6,15 +6,15 @@ class AgentTicketActionsLevel3Test < TestCase
message = 'message 3 äöüß ' + rand(99999999999999999).to_s message = 'message 3 äöüß ' + rand(99999999999999999).to_s
tests = [ tests = [
{ {
:name => 'start', :name => 'start',
:instance1 => browser_instance, :instance1 => browser_instance,
:instance2 => browser_instance, :instance2 => browser_instance,
:instance1_username => 'master@example.com', :instance1_username => 'master@example.com',
:instance1_password => 'test', :instance1_password => 'test',
:instance2_username => 'agent1@example.com', :instance2_username => 'agent1@example.com',
:instance2_password => 'test', :instance2_password => 'test',
:url => browser_url, :url => browser_url,
:action => [ :action => [
{ {
:where => :instance1, :where => :instance1,
:execute => 'close_all_tasks', :execute => 'close_all_tasks',
@ -141,9 +141,9 @@ class AgentTicketActionsLevel3Test < TestCase
:match_result => true, :match_result => true,
}, },
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => 'some level 3 <b>body</b> in instance 1', :body => 'some level 3 <b>body</b> in instance 1',
}, },
{ {
:where => :instance1, :where => :instance1,
@ -156,9 +156,9 @@ class AgentTicketActionsLevel3Test < TestCase
# check edit screen in instance 2 # check edit screen in instance 2
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:bdoy => '', :bdoy => '',
}, },
# update ticket in instance 1 # update ticket in instance 1
@ -190,9 +190,9 @@ class AgentTicketActionsLevel3Test < TestCase
# check content and edit screen in instance 1+2 # check content and edit screen in instance 1+2
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance1, :where => :instance1,
@ -203,9 +203,9 @@ class AgentTicketActionsLevel3Test < TestCase
:match_result => false, :match_result => false,
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance2, :where => :instance2,
@ -218,19 +218,19 @@ class AgentTicketActionsLevel3Test < TestCase
# reload instances, verify again # reload instances, verify again
{ {
:where => :instance1, :where => :instance1,
:execute => 'reload', :execute => 'reload',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'reload', :execute => 'reload',
}, },
# check content and edit screen in instance 1+2 # check content and edit screen in instance 1+2
{ {
:where => :instance1, :where => :instance1,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance1, :where => :instance1,
@ -241,9 +241,9 @@ class AgentTicketActionsLevel3Test < TestCase
:match_result => false, :match_result => false,
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '', :body => '',
}, },
{ {
:where => :instance2, :where => :instance2,
@ -256,9 +256,9 @@ class AgentTicketActionsLevel3Test < TestCase
# change form of ticket in instance 2 # change form of ticket in instance 2
{ {
:where => :instance2, :where => :instance2,
:execute => 'set_ticket_attributes', :execute => 'set_ticket_attributes',
:body => '22 some level 3 <b>body</b> in instance 2', :body => '22 some level 3 <b>body</b> in instance 2',
}, },
{ {
:execute => 'wait', :execute => 'wait',
@ -273,13 +273,13 @@ class AgentTicketActionsLevel3Test < TestCase
:match_result => true, :match_result => true,
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'reload', :execute => 'reload',
}, },
{ {
:where => :instance2, :where => :instance2,
:execute => 'verify_ticket_attributes', :execute => 'verify_ticket_attributes',
:body => '22 some level 3 <b>body</b> in instance 2', :body => '22 some level 3 <b>body</b> in instance 2',
}, },
{ {
:where => :instance2, :where => :instance2,