summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-16 14:39:38 -0500
committerRémy Coutable <remy@rymai.me>2017-01-16 14:39:38 -0500
commitdb0f9ef4a871ec77f347ce2437bd7e8adcb42986 (patch)
tree88c1f97c0245f4e8ca4d7750a6717fa47701f1b8 /spec
parent79373bdc5c025f189f3f17162945765a2617e820 (diff)
downloadgitlab-ce-db0f9ef4a871ec77f347ce2437bd7e8adcb42986.tar.gz
Make cycle_analytics_events_spec.rb side-effect free26622-fix-transient-failure-in-cycle_analytics_events_spec
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/projects/cycle_analytics_events_spec.rb35
1 files changed, 14 insertions, 21 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index e0368e6001f..72978846e93 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
describe 'cycle analytics events' do
+ include ApiHelpers
+
let(:user) { create(:user) }
let(:project) { create(:project, public_builds: false) }
let(:issue) { create(:issue, project: project, created_at: 2.days.ago) }
@@ -20,19 +22,19 @@ describe 'cycle analytics events' do
it 'lists the issue events' do
get namespace_project_cycle_analytics_issue_path(project.namespace, project, format: :json)
- expect(json_response['events']).not_to be_empty
-
- first_issue_iid = Issue.order(created_at: :desc).pluck(:iid).first.to_s
+ first_issue_iid = project.issues.sort(:created_desc).pluck(:iid).first.to_s
+ expect(json_response['events']).not_to be_empty
expect(json_response['events'].first['iid']).to eq(first_issue_iid)
end
it 'lists the plan events' do
get namespace_project_cycle_analytics_plan_path(project.namespace, project, format: :json)
- expect(json_response['events']).not_to be_empty
+ first_mr_short_sha = project.merge_requests.sort(:created_asc).first.commits.first.short_id
- expect(json_response['events'].first['short_sha']).to eq(MergeRequest.last.commits.first.short_id)
+ expect(json_response['events']).not_to be_empty
+ expect(json_response['events'].first['short_sha']).to eq(first_mr_short_sha)
end
it 'lists the code events' do
@@ -40,7 +42,7 @@ describe 'cycle analytics events' do
expect(json_response['events']).not_to be_empty
- first_mr_iid = project.merge_requests.order(id: :desc).pluck(:iid).first.to_s
+ first_mr_iid = project.merge_requests.sort(:created_desc).pluck(:iid).first.to_s
expect(json_response['events'].first['iid']).to eq(first_mr_iid)
end
@@ -49,17 +51,15 @@ describe 'cycle analytics events' do
get namespace_project_cycle_analytics_test_path(project.namespace, project, format: :json)
expect(json_response['events']).not_to be_empty
-
expect(json_response['events'].first['date']).not_to be_empty
end
it 'lists the review events' do
get namespace_project_cycle_analytics_review_path(project.namespace, project, format: :json)
- expect(json_response['events']).not_to be_empty
-
- first_mr_iid = MergeRequest.order(created_at: :desc).pluck(:iid).first.to_s
+ first_mr_iid = project.merge_requests.sort(:created_desc).pluck(:iid).first.to_s
+ expect(json_response['events']).not_to be_empty
expect(json_response['events'].first['iid']).to eq(first_mr_iid)
end
@@ -67,35 +67,32 @@ describe 'cycle analytics events' do
get namespace_project_cycle_analytics_staging_path(project.namespace, project, format: :json)
expect(json_response['events']).not_to be_empty
-
expect(json_response['events'].first['date']).not_to be_empty
end
it 'lists the production events' do
get namespace_project_cycle_analytics_production_path(project.namespace, project, format: :json)
- expect(json_response['events']).not_to be_empty
-
- first_issue_iid = Issue.order(created_at: :desc).pluck(:iid).first.to_s
+ first_issue_iid = project.issues.sort(:created_desc).pluck(:iid).first.to_s
+ expect(json_response['events']).not_to be_empty
expect(json_response['events'].first['iid']).to eq(first_issue_iid)
end
context 'specific branch' do
it 'lists the test events' do
- branch = MergeRequest.first.source_branch
+ branch = project.merge_requests.first.source_branch
get namespace_project_cycle_analytics_test_path(project.namespace, project, format: :json, branch: branch)
expect(json_response['events']).not_to be_empty
-
expect(json_response['events'].first['date']).not_to be_empty
end
end
context 'with private project and builds' do
before do
- ProjectMember.first.update(access_level: Gitlab::Access::GUEST)
+ project.members.first.update(access_level: Gitlab::Access::GUEST)
end
it 'does not list the test events' do
@@ -118,10 +115,6 @@ describe 'cycle analytics events' do
end
end
- def json_response
- JSON.parse(response.body)
- end
-
def create_cycle
milestone = create(:milestone, project: project)
issue.update(milestone: milestone)