Browser test fixes.

This commit is contained in:
Martin Edenhofer 2014-09-16 20:57:55 +02:00
parent c043b8bcf8
commit 8f07871520
4 changed files with 12 additions and 11 deletions

View file

@ -43,7 +43,7 @@ class AgentTicketActionLevel5Test < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',
@ -89,7 +89,7 @@ class AgentTicketActionLevel5Test < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',
@ -248,7 +248,7 @@ class AgentTicketActionLevel5Test < TestCase
{ {
:where => :instance1, :where => :instance1,
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',

View file

@ -51,7 +51,7 @@ class AgentUserManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',
@ -107,7 +107,7 @@ class AgentUserManageTest < TestCase
# accept task close warning # accept task close warning
{ {
:execute => 'click', :execute => 'click',
:css => '.modal .submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',

View file

@ -47,7 +47,7 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'watch_for', :execute => 'watch_for',
@ -95,7 +95,7 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'watch_for', :execute => 'watch_for',
@ -126,7 +126,7 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal button.submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'watch_for', :execute => 'watch_for',
@ -147,7 +147,7 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => '.modal .submit', :css => '.modal button.js-submit',
}, },
{ {
:execute => 'wait', :execute => 'wait',

View file

@ -289,7 +289,7 @@ class TestCase < Test::Unit::TestCase
element.clear element.clear
element.send_keys( action[:password] ) element.send_keys( action[:password] )
instance.find_element( { :css => '.modal input[name="role_ids"][value="3"]' } ).click instance.find_element( { :css => '.modal input[name="role_ids"][value="3"]' } ).click
instance.find_element( { :css => '.modal button.submit' } ).click instance.find_element( { :css => '.modal button.js-submit' } ).click
(1..14).each {|loop| (1..14).each {|loop|
element = instance.find_element( { :css => 'body' } ) element = instance.find_element( { :css => 'body' } )
text = element.text text = element.text
@ -354,7 +354,8 @@ class TestCase < Test::Unit::TestCase
hover_element = instance.find_element( { :css => '.navigation .tasks .task:first-child' } ) hover_element = instance.find_element( { :css => '.navigation .tasks .task:first-child' } )
if hover_element if hover_element
instance.mouse.move_to(hover_element) instance.mouse.move_to(hover_element)
click_element = instance.find_element( { :css => '.navigation .tasks .task:first-child [data-type="close"]' } ) sleep 0.1
click_element = instance.find_element( { :css => '.navigation .tasks .task:first-child .js-close' } )
if click_element if click_element
click_element.click click_element.click
sleep 0.2 sleep 0.2