From 26c9115875230fae96f74e0b81b0b5d3afca3a3a Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 1 Dec 2014 22:57:55 +0100 Subject: [PATCH] Removed not needed checks. --- test/browser/aaa_getting_started_test.rb | 18 +-- .../agent_ticket_actions_level2_test.rb | 120 +++++++++--------- .../agent_ticket_actions_level3_test.rb | 70 +++++----- 3 files changed, 98 insertions(+), 110 deletions(-) diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb index 8fdaa166d..920ae4db2 100644 --- a/test/browser/aaa_getting_started_test.rb +++ b/test/browser/aaa_getting_started_test.rb @@ -150,12 +150,6 @@ class AaaGettingStartedTest < TestCase :execute => 'click', :css => '.js-intro .btn--primary', }, - { - :execute => 'watch_for', - :area => 'body', - :value => 'testing', - :timeout => 60, - }, { :execute => 'watch_for', :area => 'body', @@ -284,11 +278,6 @@ class AaaGettingStartedTest < TestCase :execute => 'click', :css => '.js-intro .btn--primary', }, - { - :execute => 'watch_for', - :area => 'body', - :value => 'testing', - }, { :execute => 'watch_for', :area => 'body', @@ -366,11 +355,6 @@ class AaaGettingStartedTest < TestCase :execute => 'click', :css => '.js-intro .btn--primary', }, - { - :execute => 'watch_for', - :area => '.js-probe', - :value => 'testing', - }, { :execute => 'watch_for', :area => '.js-inbound h2', @@ -433,4 +417,4 @@ class AaaGettingStartedTest < TestCase } end -end +end \ No newline at end of file diff --git a/test/browser/agent_ticket_actions_level2_test.rb b/test/browser/agent_ticket_actions_level2_test.rb index dfee58a7d..be0dd6149 100644 --- a/test/browser/agent_ticket_actions_level2_test.rb +++ b/test/browser/agent_ticket_actions_level2_test.rb @@ -6,15 +6,15 @@ class AgentTicketActionsLevel2Test < TestCase message = 'message 1äöüß ' + rand(99999999999999999).to_s tests = [ { - :name => 'start', - :instance1 => browser_instance, - :instance2 => browser_instance, + :name => 'start', + :instance1 => browser_instance, + :instance2 => browser_instance, :instance1_username => 'master@example.com', :instance1_password => 'test', :instance2_username => 'agent1@example.com', :instance2_password => 'test', - :url => browser_url, - :action => [ + :url => browser_url, + :action => [ { :where => :instance1, :execute => 'close_all_tasks', @@ -102,14 +102,14 @@ class AgentTicketActionsLevel2Test < TestCase # change task and page title in second browser { - :where => :instance2, - :execute => 'verify_task_attributes', - :title => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :execute => 'verify_task_attributes', + :title => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance2, - :element => :title, - :value => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :element => :title, + :value => 'TTTsome level 2 subject 123äöü', }, # change task and page title in first browser @@ -118,36 +118,36 @@ class AgentTicketActionsLevel2Test < TestCase :value => 10, }, { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :title => 'TTTsome level 2 subject 123äöü', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :title => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance2, - :execute => 'verify_task_attributes', - :title => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :execute => 'verify_task_attributes', + :title => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance1, - :element => :title, - :value => 'TTTsome level 2 subject 123äöü', + :where => :instance1, + :element => :title, + :value => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance2, - :element => :title, - :value => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :element => :title, + :value => 'TTTsome level 2 subject 123äöü', }, # verify text in input body { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => 'some level 2 body in instance 1', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => 'some level 2 body in instance 1', }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => 'some level 2 body in instance 2', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => 'some level 2 body in instance 2', }, # add new article @@ -170,30 +170,34 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance1, :execute => 'watch_for', - :area => 'body', + :area => '.active div.ticket-article', :value => 'some update 4711', }, # verify empty text in input body { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => '', }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => 'some level 2 body in instance 2', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => 'some level 2 body in instance 2', + }, + { + :execute => 'wait', + :value => 2, }, # reload instances, verify again { - :where => :instance1, - :execute => 'reload', + :where => :instance1, + :execute => 'reload', }, { - :where => :instance2, - :execute => 'reload', + :where => :instance2, + :execute => 'reload', }, # wait till application become ready @@ -202,24 +206,24 @@ class AgentTicketActionsLevel2Test < TestCase :value => 8, }, { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :title => 'TTTsome level 2 subject 123äöü', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :title => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance2, - :execute => 'verify_task_attributes', - :title => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :execute => 'verify_task_attributes', + :title => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance1, - :element => :title, - :value => 'TTTsome level 2 subject 123äöü', + :where => :instance1, + :element => :title, + :value => 'TTTsome level 2 subject 123äöü', }, { - :where => :instance2, - :element => :title, - :value => 'TTTsome level 2 subject 123äöü', + :where => :instance2, + :element => :title, + :value => 'TTTsome level 2 subject 123äöü', }, # verify update @@ -240,14 +244,14 @@ class AgentTicketActionsLevel2Test < TestCase # verify empty text in input body { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => '', }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => 'some level 2 body in instance 2', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => 'some level 2 body in instance 2', }, ], diff --git a/test/browser/agent_ticket_actions_level3_test.rb b/test/browser/agent_ticket_actions_level3_test.rb index 29791adee..1828659f6 100644 --- a/test/browser/agent_ticket_actions_level3_test.rb +++ b/test/browser/agent_ticket_actions_level3_test.rb @@ -6,15 +6,15 @@ class AgentTicketActionsLevel3Test < TestCase message = 'message 3 äöüß ' + rand(99999999999999999).to_s tests = [ { - :name => 'start', - :instance1 => browser_instance, - :instance2 => browser_instance, + :name => 'start', + :instance1 => browser_instance, + :instance2 => browser_instance, :instance1_username => 'master@example.com', :instance1_password => 'test', :instance2_username => 'agent1@example.com', :instance2_password => 'test', - :url => browser_url, - :action => [ + :url => browser_url, + :action => [ { :where => :instance1, :execute => 'close_all_tasks', @@ -141,9 +141,9 @@ class AgentTicketActionsLevel3Test < TestCase :match_result => true, }, { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => 'some level 3 body in instance 1', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => 'some level 3 body in instance 1', }, { :where => :instance1, @@ -156,9 +156,9 @@ class AgentTicketActionsLevel3Test < TestCase # check edit screen in instance 2 { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :bdoy => '', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :bdoy => '', }, # update ticket in instance 1 @@ -190,9 +190,9 @@ class AgentTicketActionsLevel3Test < TestCase # check content and edit screen in instance 1+2 { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => '', }, { :where => :instance1, @@ -203,9 +203,9 @@ class AgentTicketActionsLevel3Test < TestCase :match_result => false, }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => '', }, { :where => :instance2, @@ -218,19 +218,19 @@ class AgentTicketActionsLevel3Test < TestCase # reload instances, verify again { - :where => :instance1, - :execute => 'reload', + :where => :instance1, + :execute => 'reload', }, { - :where => :instance2, - :execute => 'reload', + :where => :instance2, + :execute => 'reload', }, # check content and edit screen in instance 1+2 { - :where => :instance1, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance1, + :execute => 'verify_ticket_attributes', + :body => '', }, { :where => :instance1, @@ -241,9 +241,9 @@ class AgentTicketActionsLevel3Test < TestCase :match_result => false, }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => '', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => '', }, { :where => :instance2, @@ -256,9 +256,9 @@ class AgentTicketActionsLevel3Test < TestCase # change form of ticket in instance 2 { - :where => :instance2, - :execute => 'set_ticket_attributes', - :body => '22 some level 3 body in instance 2', + :where => :instance2, + :execute => 'set_ticket_attributes', + :body => '22 some level 3 body in instance 2', }, { :execute => 'wait', @@ -273,13 +273,13 @@ class AgentTicketActionsLevel3Test < TestCase :match_result => true, }, { - :where => :instance2, - :execute => 'reload', + :where => :instance2, + :execute => 'reload', }, { - :where => :instance2, - :execute => 'verify_ticket_attributes', - :body => '22 some level 3 body in instance 2', + :where => :instance2, + :execute => 'verify_ticket_attributes', + :body => '22 some level 3 body in instance 2', }, { :where => :instance2,