Commit 0f3deac3 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix tests

parent 0fa4ab5f
...@@ -104,7 +104,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps ...@@ -104,7 +104,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'commit has ci status' do step 'commit has ci status' do
@project.enable_ci(@user) @project.enable_ci(@user)
create :ci_commit, project: @project.gitlab_ci_project, sha: sample_commit.id create :ci_commit, gl_project: @project, sha: sample_commit.id
end end
step 'I see commit ci info' do step 'I see commit ci info' do
......
...@@ -204,6 +204,6 @@ module SharedProject ...@@ -204,6 +204,6 @@ module SharedProject
step 'project "Shop" has CI build' do step 'project "Shop" has CI build' do
project = Project.find_by(name: "Shop") project = Project.find_by(name: "Shop")
create :ci_commit, project: project.gitlab_ci_project, sha: project.commit.sha create :ci_commit, gl_project: project, sha: project.commit.sha
end end
end end
...@@ -4,13 +4,12 @@ describe "Charts" do ...@@ -4,13 +4,12 @@ describe "Charts" do
context "build_times" do context "build_times" do
before do before do
@project = FactoryGirl.create(:ci_project) @commit = FactoryGirl.create(:ci_commit)
@commit = FactoryGirl.create(:ci_commit, project: @project)
FactoryGirl.create(:ci_build, commit: @commit) FactoryGirl.create(:ci_build, commit: @commit)
end end
it 'should return build times in minutes' do it 'should return build times in minutes' do
chart = Ci::Charts::BuildTime.new(@project) chart = Ci::Charts::BuildTime.new(@commit.project)
expect(chart.build_times).to eq([2]) expect(chart.build_times).to eq([2])
end end
end end
......
...@@ -404,10 +404,12 @@ describe Project do ...@@ -404,10 +404,12 @@ describe Project do
describe :ci_commit do describe :ci_commit do
let(:project) { create :project } let(:project) { create :project }
let(:ci_project) { create :ci_project, gl_project: project } let(:commit) { create :ci_commit, gl_project: project }
let(:commit) { create :ci_commit, project: ci_project }
before { project.create_gitlab_ci_service(active: true) } before do
project.ensure_ci_project
project.create_gitlab_ci_service(active: true)
end
it { expect(project.ci_commit(commit.sha)).to eq(commit) } it { expect(project.ci_commit(commit.sha)).to eq(commit) }
end end
......
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