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

Fixed browser tests.

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-13 11:39:48 +02:00
parent 261c9e3214
commit 604f4c918e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -70,7 +70,7 @@ curl http://localhost/api/v1/users.json -v -u #{login}:#{password}
end end
users_all = [] users_all = []
users.each {|user| users.each {|user|
users_all.push User.find( user.id ) users_all.push User.find( user.id ).attributes_with_associations
} }
render :json => users_all, :status => :ok render :json => users_all, :status => :ok
end end

6
test/browser/manage_test.rb
View file

@ -76,11 +76,11 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => 'a[data-type="edit"]:last-child', :css => '.table-overview tr:last-child td',
}, },
{ {
:execute => 'wait', :execute => 'wait',
:value => 1, :value => 2,
}, },
{ {
:execute => 'set', :execute => 'set',
@ -146,7 +146,7 @@ class ManageTest < TestCase
}, },
{ {
:execute => 'click', :execute => 'click',
:css => 'a[data-type="edit"]:last-child', :css => '.table-overview tr:last-child td',
}, },
{ {
:execute => 'wait', :execute => 'wait',