diff options
| author | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
| commit | 89b879a3e5ee27bfc90751dcd02aa2213262cc5f (patch) | |
| tree | de610d5ef7146c073b7129a20762838d78aeca03 /test/functional/api/users_controller_test.rb | |
| parent | 90c3fc431133cf18d83afd8e394e45c0bd5f63ac (diff) | |
| parent | 7120117687e2e6078d7e94ddb9e8b93e8ad5f2e3 (diff) | |
Merge branch 'upgrade/gemfile' into 'master'
Upgrade/gemfile
See merge request leap/webapp!55
Diffstat (limited to 'test/functional/api/users_controller_test.rb')
| -rw-r--r-- | test/functional/api/users_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb index ee183f9..dfaf959 100644 --- a/test/functional/api/users_controller_test.rb +++ b/test/functional/api/users_controller_test.rb @@ -96,7 +96,7 @@ class Api::UsersControllerTest < ApiControllerTest end test "admin can show user" do - user = FactoryGirl.create :user + user = FactoryBot.create :user login :is_admin? => true api_get :show, :id => 0, :login => user.login, :format => :json assert_response :success @@ -109,7 +109,7 @@ class Api::UsersControllerTest < ApiControllerTest end test "admin can show is_admin property" do - admin = FactoryGirl.create :user + admin = FactoryBot.create :user with_config(admins: [admin.login]) do login admin api_get :show, :id => admin.id, :format => :json |