diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 18:08:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-28 18:08:02 +0300 |
commit | 1f1e53f43f87cada9b515571cc973e9eadcbc4e4 (patch) | |
tree | d9bca1bda729b495601634947665f11279b5d6cf /spec/features/dashboard | |
parent | a83a97f60432c6c352af80d55339e9fe45b63307 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/dashboard')
-rw-r--r-- | spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/dashboard/project_member_activity_index_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb index 56b47b74626..42ec40f21da 100644 --- a/spec/features/dashboard/datetime_on_tooltips_spec.rb +++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb @@ -12,7 +12,7 @@ describe 'Tooltips on .timeago dates', :js do before do project.add_maintainer(user) - Event.create( project: project, author_id: user.id, action: Event::JOINED, + Event.create( project: project, author_id: user.id, action: :joined, updated_at: created_date, created_at: created_date) sign_in user diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb index 8e7a0b2a611..120c0357495 100644 --- a/spec/features/dashboard/project_member_activity_index_spec.rb +++ b/spec/features/dashboard/project_member_activity_index_spec.rb @@ -18,7 +18,7 @@ describe 'Project member activity', :js do context 'when a user joins the project' do before do - visit_activities_and_wait_with_event(Event::JOINED) + visit_activities_and_wait_with_event(:joined) end it "presents the correct message" do @@ -29,7 +29,7 @@ describe 'Project member activity', :js do context 'when a user leaves the project' do before do - visit_activities_and_wait_with_event(Event::LEFT) + visit_activities_and_wait_with_event(:left) end it "presents the correct message" do @@ -40,7 +40,7 @@ describe 'Project member activity', :js do context 'when a users membership expires for the project' do before do - visit_activities_and_wait_with_event(Event::EXPIRED) + visit_activities_and_wait_with_event(:expired) end it "presents the correct message" do |