Commit ce2dd42e authored by Kamil Trzcinski's avatar Kamil Trzcinski

Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3

* rename-ci-commit-phase-2:
  Rename remaining ci_commits in specs
parents 1927a2d3 836061dd
......@@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context "Active build for Merge Request" do
let!(:pipeline) { create(:ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
let!(:ci_build) { create(:ci_build, pipeline: pipeline) }
before do
login_as user
......
......@@ -5,7 +5,7 @@ describe API::CommitStatuses, api: true do
let!(:project) { create(:project) }
let(:commit) { project.repository.commit }
let(:commit_status) { create(:commit_status, pipeline: ci_commit) }
let(:commit_status) { create(:commit_status, pipeline: pipeline) }
let(:guest) { create_user(:guest) }
let(:reporter) { create_user(:reporter) }
let(:developer) { create_user(:developer) }
......
......@@ -90,10 +90,10 @@ describe API::API, api: true do
end
it "should return status for CI" do
ci_commit = project.ensure_pipeline(project.repository.commit.sha, 'master')
pipeline = project.ensure_pipeline(project.repository.commit.sha, 'master')
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
expect(response.status).to eq(200)
expect(json_response['status']).to eq(ci_commit.status)
expect(json_response['status']).to eq(pipeline.status)
end
end
......
......@@ -52,7 +52,7 @@ describe CreateCommitBuildsService, services: true do
end
end
it 'skips creating ci_commit for refs without .gitlab-ci.yml' do
it 'skips creating pipeline for refs without .gitlab-ci.yml' do
stub_ci_pipeline_yaml_file(nil)
result = service.execute(project, user,
ref: 'refs/heads/0_1',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment