diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/requests/api/users_spec.rb | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/requests/api/users_spec.rb')
-rw-r--r-- | spec/requests/api/users_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 864f6f77f39..4a0f0eea088 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -734,7 +734,7 @@ describe API::Users, :do_not_mock_admin_mode do end describe "PUT /users/:id" do - let!(:admin_user) { create(:admin) } + let_it_be(:admin_user) { create(:admin) } it "returns 200 OK on success" do put api("/users/#{user.id}", admin), params: { bio: 'new test bio' } @@ -2405,8 +2405,8 @@ describe API::Users, :do_not_mock_admin_mode do end context "user activities", :clean_gitlab_redis_shared_state do - let!(:old_active_user) { create(:user, last_activity_on: Time.utc(2000, 1, 1)) } - let!(:newly_active_user) { create(:user, last_activity_on: 2.days.ago.midday) } + let_it_be(:old_active_user) { create(:user, last_activity_on: Time.utc(2000, 1, 1)) } + let_it_be(:newly_active_user) { create(:user, last_activity_on: 2.days.ago.midday) } context 'last activity as normal user' do it 'has no permission' do |