Fix specs 2

1 files changed, 8 insertions, 5 deletions

diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 57826fe872b..5553687707d 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -9,14 +9,17 @@ feature 'Cycle Analytics', feature: true, js: true do
   let(:mr) { create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}") }
   let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha) }
 
-  before { mr.update(head_pipeline: pipeline) }
+  before do
+    allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
+  end
 
   context 'as an allowed user' do
     context 'when project is new' do
       before  do
         project.add_master(user)
-        mr.update(head_pipeline_id: pipeline.id)
+
         login_as(user)
+
         visit namespace_project_cycle_analytics_path(project.namespace, project)
         wait_for_ajax
       end
@@ -33,8 +36,8 @@ feature 'Cycle Analytics', feature: true, js: true do
 
     context "when there's cycle analytics data" do
       before do
-        project.team << [user, :master]
-
+        mr.update(head_pipeline: pipeline)
+        project.add_master(user)
         create_cycle
         deploy_master
 
@@ -87,7 +90,7 @@ feature 'Cycle Analytics', feature: true, js: true do
 
   context "as a guest" do
     before do
-      project.team << [guest, :guest]
+      project.add_guest(guest)
 
       allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
       create_cycle