From b739b891c8bd72948f46847c802ea366db44e5ee Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 4 Oct 2014 00:39:54 +0200 Subject: [PATCH] Moved to new markup. --- .../agent_ticket_actions_level1_test.rb | 56 +++++++++---------- .../agent_ticket_actions_level2_test.rb | 40 ++++++------- .../agent_ticket_actions_level3_test.rb | 22 ++++---- .../agent_ticket_actions_level4_test.rb | 5 +- .../agent_ticket_actions_level5_test.rb | 34 +++++------ test/browser/agent_user_manage_test.rb | 42 ++++++++------ test/browser/customer_ticket_create_test.rb | 8 +-- test/browser/taskbar_task_test.rb | 4 +- 8 files changed, 109 insertions(+), 102 deletions(-) diff --git a/test/browser/agent_ticket_actions_level1_test.rb b/test/browser/agent_ticket_actions_level1_test.rb index 76960f397..e42dae175 100644 --- a/test/browser/agent_ticket_actions_level1_test.rb +++ b/test/browser/agent_ticket_actions_level1_test.rb @@ -30,31 +30,31 @@ class AgentTicketActionLevel1Test < TestCase # remember old ticket where we want to merge to { :execute => 'match', - :css => '.active .ticket-number', + :css => '.active .page-header .ticket-number', :value => '^(.*)$', :no_quote => true, :match_result => true, }, # update ticket - { - :execute => 'select', - :css => '.active select[name="type_id"]', - :value => 'note', - }, + #{ + # :execute => 'select', + # :css => '.active select[name="type_id"]', + # :value => 'note', + #}, { :execute => 'check', - :css => '.active textarea[name="body"]', + :css => '.active [data-name="body"]', :result => true, }, { :execute => 'set', - :css => '.active textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some body 1234 äöüß', }, { :execute => 'click', - :css => '.active button.submit', + :css => '.active input.submit', }, { :execute => 'wait', @@ -66,8 +66,7 @@ class AgentTicketActionLevel1Test < TestCase :value => 'some body 1234 äöüß', }, { - :execute => 'click', - :css => '#task [data-type="close"]', + :execute => 'close_all_tasks', }, ], }, @@ -81,40 +80,40 @@ class AgentTicketActionLevel1Test < TestCase :execute => 'create_ticket', :group => 'Users', :subject => 'test to merge', - :body => 'some body 123äöü 222', + :body => 'some body 123äöü 222 - test to merge', }, # check ticket { :execute => 'watch_for', - :area => '.content_permanent.active', - :value => 'some body 123äöü 222', + :area => '.content.active', + :value => 'some body 123äöü 222 - test to merge', }, # update ticket - { - :execute => 'select', - :css => '.content_permanent.active select[name="type_id"]', - :value => 'note', - }, + #{ + # :execute => 'select', + # :css => '.content_permanent.active select[name="type_id"]', + # :value => 'note', + #}, { :execute => 'check', - :css => '.content_permanent.active textarea[name="body"]', + :css => '.content.active [data-name="body"]', :result => true, }, { :execute => 'set', - :css => '.content_permanent.active textarea[name="body"]', - :value => 'some body 1234 äöüß 222', + :css => '.content.active [data-name="body"]', + :value => 'some body 1234 äöüß 333', }, { :execute => 'click', - :css => '.content_permanent.active button.submit', + :css => '.content.active input.submit', }, { :execute => 'watch_for', - :area => '.content_permanent.active .ticket-answer', - :value => 'some body 1234 äöüß 222', + :area => '.content.active .ticket-edit', + :value => 'some body 1234 äöüß 333', }, # check if task is shown @@ -131,7 +130,7 @@ class AgentTicketActionLevel1Test < TestCase :action => [ { :execute => 'click', - :css => '.active .actions', + :css => '.active .actions button', }, { :execute => 'click', @@ -158,7 +157,7 @@ class AgentTicketActionLevel1Test < TestCase # check if megred to ticket is shown now { :execute => 'match', - :css => '.active .ticket-number', + :css => '.active .page-header .ticket-number', :value => '###stack###', :match_result => true, }, @@ -173,8 +172,7 @@ class AgentTicketActionLevel1Test < TestCase # close task/cleanup { - :execute => 'click', - :css => '#task [data-type="close"]', + :execute => 'close_all_tasks', }, ], }, diff --git a/test/browser/agent_ticket_actions_level2_test.rb b/test/browser/agent_ticket_actions_level2_test.rb index d7ae1d9ea..04756c451 100644 --- a/test/browser/agent_ticket_actions_level2_test.rb +++ b/test/browser/agent_ticket_actions_level2_test.rb @@ -46,7 +46,7 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-number', + :css => '.active .page-header .ticket-number', :value => '^(.*)$', :no_quote => true, :match_result => true, @@ -123,13 +123,13 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 2', }, { :where => :instance1, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 1', }, @@ -137,7 +137,7 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.taskbar .active .task', + :css => '.tasks .active', :value => 'TTTsome level 2 subject 123äöü', :match_result => true, }, @@ -162,7 +162,7 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.taskbar .active .task', + :css => '.tasks .active', :value => 'TTTsome level 2 subject 123äöü', :match_result => true, }, @@ -181,35 +181,35 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 1', :match_result => true, }, { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 2', :match_result => true, }, # add new article - { - :where => :instance1, - :execute => 'select', - :css => '.active .ticket-answer select[name="type_id"]', - :value => 'note', - }, + #{ + # :where => :instance1, + # :execute => 'select', + # :css => '.active .ticket-edit select[name="type_id"]', + # :value => 'note', + #}, { :where => :instance1, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some update 4711', }, { :where => :instance1, :execute => 'click', - :css => '.active button.submit', + :css => '.active input.submit', }, { :where => :instance1, @@ -222,14 +222,14 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => '', :match_result => true, }, { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 2', :match_result => true, }, @@ -260,7 +260,7 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.taskbar .active .task', + :css => '.tasks .active', :value => 'TTTsome level 2 subject 123äöü', :match_result => true, }, @@ -295,14 +295,14 @@ class AgentTicketActionsLevel2Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => '', :match_result => true, }, { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some level 2 body in instance 2', :match_result => true, }, diff --git a/test/browser/agent_ticket_actions_level3_test.rb b/test/browser/agent_ticket_actions_level3_test.rb index 76f7f9863..402e44815 100644 --- a/test/browser/agent_ticket_actions_level3_test.rb +++ b/test/browser/agent_ticket_actions_level3_test.rb @@ -46,7 +46,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-number', + :css => '.active .page-header .ticket-number', :value => '^#(.*)$', :no_quote => true, :match_result => true, @@ -89,7 +89,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance1, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => 'some level 3 body in instance 1', }, { @@ -101,7 +101,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => 'some level 3 body in instance 2', }, { @@ -145,7 +145,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => 'some level 3 body in instance 1', :match_result => true, }, @@ -162,7 +162,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '^$', :no_quote => true, :match_result => true, @@ -199,7 +199,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '^$', :no_quote => true, :match_result => true, @@ -215,7 +215,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '^$', :no_quote => true, :match_result => true, @@ -243,7 +243,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance1, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '^$', :no_quote => true, :match_result => true, @@ -259,7 +259,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '^$', :no_quote => true, :match_result => true, @@ -277,7 +277,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '22 some level 3 body in instance 2', }, { @@ -299,7 +299,7 @@ class AgentTicketActionsLevel3Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active .ticket-answer textarea[name="body"]', + :css => '.active .ticket-edit textarea[name="body"]', :value => '22 some level 3 body in instance 2', :match_result => true, }, diff --git a/test/browser/agent_ticket_actions_level4_test.rb b/test/browser/agent_ticket_actions_level4_test.rb index 4bb325472..36bdaa71e 100644 --- a/test/browser/agent_ticket_actions_level4_test.rb +++ b/test/browser/agent_ticket_actions_level4_test.rb @@ -26,7 +26,7 @@ class AgentTicketActionLevel4Test < TestCase # reload instances, verify autosave { - :execute => 'reload', + :execute => 'reload', }, { :execute => 'wait', @@ -57,8 +57,7 @@ class AgentTicketActionLevel4Test < TestCase # close task/cleanup { - :execute => 'click', - :css => '#task [data-type="close"]', + :execute => 'close_all_tasks', }, ], }, diff --git a/test/browser/agent_ticket_actions_level5_test.rb b/test/browser/agent_ticket_actions_level5_test.rb index fe451ee90..ed0a26601 100644 --- a/test/browser/agent_ticket_actions_level5_test.rb +++ b/test/browser/agent_ticket_actions_level5_test.rb @@ -120,7 +120,7 @@ class AgentTicketActionLevel5Test < TestCase }, { :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => '::' + random, }, { @@ -143,7 +143,7 @@ class AgentTicketActionLevel5Test < TestCase }, { :execute => 'match', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'some content' + random, :match_result => true, }, @@ -291,7 +291,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => '::' + random, }, { @@ -319,7 +319,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'some content ' + random, :match_result => true, }, @@ -330,7 +330,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', + :css => '.active .ticket-create input[name="customer_id_completion"]', :value => 'nicole', }, { @@ -340,13 +340,13 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'sendkey', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', + :css => '.active .ticket-create input[name="customer_id_completion"]', :value => :arrow_down, }, { :where => :instance2, :execute => 'sendkey', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', + :css => '.active .ticket-create input[name="customer_id_completion"]', :value => :tab, }, { @@ -357,7 +357,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => '::' + random, }, { @@ -378,7 +378,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'some content Braun' + random, :match_result => true, }, @@ -420,7 +420,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'test', }, { @@ -430,7 +430,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => '::' + random, }, { @@ -456,7 +456,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'some content Braun' + random, :match_result => true, }, @@ -494,7 +494,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '#form-customer input[name="customer_id_autocompletion"]', + :css => '#form-customer input[name="customer_id_completion"]', :value => firstname, }, { @@ -504,13 +504,13 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'sendkey', - :css => '#form-customer input[name="customer_id_autocompletion"]', + :css => '#form-customer input[name="customer_id_completion"]', :value => :arrow_down, }, { :where => :instance2, :execute => 'sendkey', - :css => '#form-customer input[name="customer_id_autocompletion"]', + :css => '#form-customer input[name="customer_id_completion"]', :value => :tab, }, { @@ -531,7 +531,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'set', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => '::' + random, }, { @@ -557,7 +557,7 @@ class AgentTicketActionLevel5Test < TestCase { :where => :instance2, :execute => 'match', - :css => '.active textarea[name=body]', + :css => '.active [data-name="body"]', :value => 'some content ' + lastname, :match_result => true, }, diff --git a/test/browser/agent_user_manage_test.rb b/test/browser/agent_user_manage_test.rb index 6bf19c0cf..6836f84e1 100644 --- a/test/browser/agent_user_manage_test.rb +++ b/test/browser/agent_user_manage_test.rb @@ -28,7 +28,17 @@ class AgentUserManageTest < TestCase }, { :execute => 'click', - :css => '.active .customer_new', + :css => '.active [name="customer_id_completion"]', + }, + { + :execute => 'sendkey', + :css => '.active [name="customer_id_completion"]', + :value => :arrow_down, + }, + { + :execute => 'sendkey', + :css => '.active [name="customer_id_completion"]', + :value => :enter, }, { :execute => 'wait', @@ -62,34 +72,34 @@ class AgentUserManageTest < TestCase { :execute => 'match', :css => '.active input[name="customer_id"]', - :value => '^[0-9].?$', + :value => '^\d+$', :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => firstname, :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => lastname, :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => customer_user_email, :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => fullname, :no_quote => true, :match_result => true, @@ -128,20 +138,20 @@ class AgentUserManageTest < TestCase { :execute => 'match', :css => '.active input[name="customer_id"]', - :value => '^[0-9].?$', + :value => '^\d+$', :no_quote => true, :match_result => false, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => firstname, :no_quote => true, :match_result => false, }, { :execute => 'set', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', + :css => '.active .ticket-create input[name="customer_id_completion"]', :value => customer_user_email, }, { @@ -150,13 +160,13 @@ class AgentUserManageTest < TestCase }, { :execute => 'sendkey', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', + :css => '.active .ticket-create input[name="customer_id_completion"]', :value => :arrow_down, }, { :execute => 'sendkey', - :css => '.active .ticket-create input[name="customer_id_autocompletion"]', - :value => :tab, + :css => '.active .ticket-create input[name="customer_id_completion"]', + :value => :enter, }, { :execute => 'wait', @@ -165,27 +175,27 @@ class AgentUserManageTest < TestCase { :execute => 'match', :css => '.active input[name="customer_id"]', - :value => '^[0-9].?$', + :value => '^\d+$', :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => firstname, :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => lastname, :no_quote => true, :match_result => true, }, { :execute => 'match', - :css => '.active input[name="customer_id_autocompletion"]', + :css => '.active input[name="customer_id_completion"]', :value => fullname, :no_quote => true, :match_result => true, diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb index f89e459d1..4edfc1cf5 100644 --- a/test/browser/customer_ticket_create_test.rb +++ b/test/browser/customer_ticket_create_test.rb @@ -36,7 +36,7 @@ class CustomerTicketCreateTest < TestCase }, { :execute => 'set', - :css => '.ticket-create textarea[name="body"]', + :css => '.ticket-create [data-name="body"]', :value => 'some body 123äöü', }, { @@ -64,17 +64,17 @@ class CustomerTicketCreateTest < TestCase # update ticket { :execute => 'check', - :css => '.active textarea[name="body"]', + :css => '.active [data-name="body"]', :result => true, }, { :execute => 'set', - :css => '.active textarea[name="body"]', + :css => '.active [data-name="body"]', :value => 'some body 1234 äöüß', }, { :execute => 'click', - :css => '.active button', + :css => '.active input[type="submit"]', :type => 'submit', }, { diff --git a/test/browser/taskbar_task_test.rb b/test/browser/taskbar_task_test.rb index d5dc93df5..b4f7cb6ba 100644 --- a/test/browser/taskbar_task_test.rb +++ b/test/browser/taskbar_task_test.rb @@ -121,7 +121,7 @@ class TaskbarTaskTest < TestCase }, { :execute => 'set', - :css => '.active .ticket-create textarea[name="body"]', + :css => '.active .ticket-create [data-name="body"]', :value => 'INBOUND BODY TEST#1', }, { @@ -147,7 +147,7 @@ class TaskbarTaskTest < TestCase }, { :execute => 'set', - :css => '.active .ticket-create textarea[name="body"]', + :css => '.active .ticket-create [data-name="body"]', :value => 'OUTBOUND BODY TEST#1', }, {