1 files changed, 37 insertions, 18 deletions

diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 0648c89a5c7..f530063352a 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 feature 'Cycle Analytics', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:guest) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:issue) { create(:issue, project: project, created_at: 2.days.ago) }
   let(:milestone) { create(:milestone, project: project) }
-  let(:mr) { create_merge_request_closing_issue(issue) }
-  let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha) }
+  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, head_pipeline_of: mr) }
 
   context 'as an allowed user' do
     context 'when project is new' do
       before  do
-        project.team << [user, :master]
-        login_as(user)
-        visit namespace_project_cycle_analytics_path(project.namespace, project)
-        wait_for_ajax
+        project.add_master(user)
+
+        sign_in(user)
+
+        visit project_cycle_analytics_path(project)
+        wait_for_requests
       end
 
       it 'shows introductory message' do
@@ -32,14 +32,14 @@ feature 'Cycle Analytics', feature: true, js: true do
 
     context "when there's cycle analytics data" do
       before do
-        project.team << [user, :master]
-
         allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
+        project.add_master(user)
+
         create_cycle
         deploy_master
 
-        login_as(user)
-        visit namespace_project_cycle_analytics_path(project.namespace, project)
+        sign_in(user)
+        visit project_cycle_analytics_path(project)
       end
 
       it 'shows data on each stage' do
@@ -64,19 +64,38 @@ feature 'Cycle Analytics', feature: true, js: true do
         expect_issue_to_be_present
       end
     end
+
+    context "when my preferred language is Spanish" do
+      before do
+        user.update_attribute(:preferred_language, 'es')
+
+        project.team << [user, :master]
+        sign_in(user)
+        visit project_cycle_analytics_path(project)
+        wait_for_requests
+      end
+
+      it 'shows the content in Spanish' do
+        expect(page).to have_content('Estado del Pipeline')
+      end
+
+      it 'resets the language to English' do
+        expect(I18n.locale).to eq(:en)
+      end
+    end
   end
 
   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
       deploy_master
 
-      login_as(guest)
-      visit namespace_project_cycle_analytics_path(project.namespace, project)
-      wait_for_ajax
+      sign_in(guest)
+      visit project_cycle_analytics_path(project)
+      wait_for_requests
     end
 
     it 'needs permissions to see restricted stages' do
@@ -120,6 +139,6 @@ feature 'Cycle Analytics', feature: true, js: true do
 
   def click_stage(stage_name)
     find('.stage-nav li', text: stage_name).click
-    wait_for_ajax
+    wait_for_requests
   end
 end