Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed creation of tickets.

Browse source
This commit is contained in:
Martin Edenhofer 2015-06-28 04:18:34 +02:00
parent 9570aeeeff
commit 2723f72ff8
10 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/agent_ticket_create.jst.eco
View file

@ -38,7 +38,7 @@
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T('Cancel & Go Back') %></a> <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T('Cancel & Go Back') %></a>
<button type="submit" class="btn btn--success align-right"><%- @T('Create') %></button> <button type="submit" class="btn btn--success js-submit align-right"><%- @T('Create') %></button>
</div> </div>
</form> </form>
</div> </div>

4
app/assets/javascripts/app/views/customer_ticket_create.jst.eco
View file

@ -18,8 +18,8 @@
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button> <button type="submit" class="btn btn--success js-submit align-right"><%- @T( 'Create' ) %></button>
</div> </div>
</form> </form>

4
app/assets/javascripts/app/views/password/reset.jst.eco
View file

@ -10,8 +10,8 @@
<form class="form-password"> <form class="form-password">
<div class="form-password-item"></div> <div class="form-password-item"></div>
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a> <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn--primary submit align-right"><%- @T( 'Submit' ) %></button> <button class="btn btn--primary js-submit align-right"><%- @T( 'Submit' ) %></button>
</div> </div>
</form> </form>
<% end %> <% end %>

4
app/assets/javascripts/app/views/password/reset_change.jst.eco
View file

@ -4,8 +4,8 @@
<form> <form>
<div class="form-password-change"></div> <div class="form-password-change"></div>
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn--primary submit align-right"><%- @T( 'Submit' ) %></button> <button class="btn btn--primary js-submit align-right"><%- @T( 'Submit' ) %></button>
</div> </div>
</form> </form>
</div> </div>

4
app/assets/javascripts/app/views/signup.jst.eco
View file

@ -4,8 +4,8 @@
<h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1> <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
<form> <form>
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle" href="#login"><%- @T( 'Cancel & Go Back' ) %></a> <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn--primary submit align-right"><%- @T( 'Create my account' ) %></button> <button class="btn btn--primary js-submit align-right"><%- @T( 'Create my account' ) %></button>
</div> </div>
</form> </form>
</div> </div>

2
test/browser/agent_ticket_actions_level4_test.rb
View file

@ -52,7 +52,7 @@ class AgentTicketActionLevel4Test < TestCase
) )
# finally create ticket # finally create ticket
click( css: '.content.active button.submit' ) click( css: '.content.active button.js-submit' )
sleep 5 sleep 5
location_check( location_check(

4
test/browser/agent_ticket_actions_level6_test.rb
View file

@ -29,7 +29,7 @@ class AgentTicketActionLevel6Test < TestCase
sleep 1 sleep 1
# submit form # submit form
click( css: '.content.active button.submit' ) click( css: '.content.active button.js-submit' )
sleep 2 sleep 2
# check warning # check warning
@ -42,7 +42,7 @@ class AgentTicketActionLevel6Test < TestCase
@browser.execute_script( "App.TestHelper.attachmentUploadFake('.active .richtext .attachments')" ) @browser.execute_script( "App.TestHelper.attachmentUploadFake('.active .richtext .attachments')" )
# submit form # submit form
click( css: '.content.active button.submit' ) click( css: '.content.active button.js-submit' )
sleep 5 sleep 5
# no warning # no warning

2
test/browser/customer_ticket_create_test.rb
View file

@ -28,7 +28,7 @@ class CustomerTicketCreateTest < TestCase
css: '.newTicket [data-name="body"]', css: '.newTicket [data-name="body"]',
value: 'some body 123äöü', value: 'some body 123äöü',
) )
click( css: '.newTicket button.submit' ) click( css: '.newTicket button.js-submit' )
sleep 5 sleep 5
# check if ticket is shown # check if ticket is shown

2
test/browser/signup_password_change_and_reset_test.rb
View file

@ -30,7 +30,7 @@ class SignupPasswordChangeAndResetTest < TestCase
css: 'input[name="password_confirm"]', css: 'input[name="password_confirm"]',
value: 'some-pass', value: 'some-pass',
) )
click( css: 'button.submit' ) click( css: 'button.js-submit' )
sleep 5 sleep 5
exists_not( css: '.signup' ) exists_not( css: '.signup' )

2
test/browser_test_helper.rb
View file

@ -1070,7 +1070,7 @@ wait untill text in selector disabppears
end end
sleep 0.8 sleep 0.8
#instance.execute_script( '$(".content.active .newTicket form").submit();' ) #instance.execute_script( '$(".content.active .newTicket form").submit();' )
instance.find_elements( { css: '.active .newTicket button.submit' } )[0].click instance.find_elements( { css: '.active .newTicket button.js-submit' } )[0].click
sleep 1 sleep 1
(1..10).each { (1..10).each {
if instance.current_url =~ /#{Regexp.quote('#ticket/zoom/')}/ if instance.current_url =~ /#{Regexp.quote('#ticket/zoom/')}/