summaryrefslogtreecommitdiff
path: root/spec/models/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-11-12 16:52:22 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2015-11-13 10:52:50 +0100
commite53a56aceae6e79412a853ac3cfd1e47570135eb (patch)
treef7187848e0b24aa6a309648d5bee31bfb8fcff86 /spec/models/ci
parent6384c757b7ce6d1c0c3e2a3828b0cfac26dfb7f9 (diff)
downloadgitlab-ce-e53a56aceae6e79412a853ac3cfd1e47570135eb.tar.gz
Fix broken tests
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/project_spec.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/spec/models/ci/project_spec.rb b/spec/models/ci/project_spec.rb
index 490c6a67982..4546cbfad1e 100644
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
@@ -28,8 +28,8 @@
require 'spec_helper'
describe Ci::Project do
- let(:gl_project) { FactoryGirl.create :empty_project }
- let(:project) { FactoryGirl.create :ci_project, gl_project: gl_project }
+ let(:project) { FactoryGirl.create :ci_project }
+ let(:gl_project) { project.gl_project }
subject { project }
it { is_expected.to have_many(:runner_projects) }
@@ -194,18 +194,6 @@ describe Ci::Project do
end
end
- describe 'Project.parse' do
- let(:project) { FactoryGirl.create :project }
-
- subject { Ci::Project.parse(project) }
-
- it { is_expected.to be_valid }
- it { is_expected.to be_kind_of(Ci::Project) }
- it { expect(subject.name).to eq(project.name_with_namespace) }
- it { expect(subject.gitlab_id).to eq(project.id) }
- it { expect(subject.gitlab_url).to eq(project.web_url) }
- end
-
describe :repo_url_with_auth do
let(:project) { FactoryGirl.create :ci_project }
subject { project.repo_url_with_auth }