summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-03 11:28:14 +0100
committerJames Lopez <james@jameslopez.es>2016-11-17 08:22:56 +0100
commit8bb4750eb3987999b0ee617c29224e468e9147b3 (patch)
tree1067b8619305ed3b45e450a37373453d08275117
parent9ead268cfaee7cb23fa00c7cf8bcf536cafab91a (diff)
downloadgitlab-ce-8bb4750eb3987999b0ee617c29224e468e9147b3.tar.gz
added pipelines to integration spec
-rw-r--r--spec/requests/projects/cycle_analytics_events_spec.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index e2733be4c3a..3ee8795ac4c 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -50,7 +50,8 @@ describe 'cycle analytics events' do
expect(json_response['events']).not_to be_empty
- # TODO create builds
+ expect(json_response['events'].first['pipeline']).not_to be_empty
+
end
it 'lists the review events in the right order' do
@@ -68,7 +69,7 @@ describe 'cycle analytics events' do
expect(json_response['events']).not_to be_empty
- # TODO create builds
+ expect(json_response['events'].first['pipeline']).not_to be_empty
end
it 'lists the production events in the right order' do
@@ -90,8 +91,11 @@ describe 'cycle analytics events' do
issue = create(:issue, project: project, created_at: 2.days.ago)
milestone = create(:milestone, project: project)
issue.update(milestone: milestone)
+ mr = create_merge_request_closing_issue(issue)
+
+ pipeline = create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha)
+ pipeline.run
- create_merge_request_closing_issue(issue)
merge_merge_requests_closing_issue(issue)
end
end