diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-05-04 18:11:20 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-05-04 18:11:20 +0300 |
| commit | ce534e9395b9c6eaaef7400547a5adc613f046a7 (patch) | |
| tree | c869863d978a26d4864436d91d129b635c18d564 /spec/models | |
| parent | 5b7589664297fd066324acfb9b6eafe2ad1d432c (diff) | |
| download | gitlab-ci-ce534e9395b9c6eaaef7400547a5adc613f046a7.tar.gz | |
Refactoring. Clean up advanced settings. Migrate from gotlab_url to path
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/commit_spec.rb | 8 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index 28cd0ef..75d5610 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -111,7 +111,7 @@ describe Commit do describe :compare? do subject { commit_with_project.compare? } - context 'if project.gitlab_url and commit.before_sha are not nil' do + context 'if commit.before_sha are not nil' do it { should be_true } end end @@ -130,12 +130,6 @@ describe Commit do it { commit.sha.should start_with(subject) } end - describe :gitlab? do - subject { commit_with_project.gitlab? } - - it { should eq(project.gitlab?) } - end - describe "create_deploy_builds" do it "creates deploy build" do FactoryGirl.create :job, job_type: :deploy, project: project diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 482a401..0b334d3 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -9,7 +9,7 @@ # updated_at :datetime # token :string(255) # default_ref :string(255) -# gitlab_url :string(255) +# path :string(255) # always_build :boolean default(FALSE), not null # polling_interval :integer # public :boolean default(FALSE), not null @@ -132,7 +132,7 @@ describe Project do it { parsed_project.should be_kind_of(Project) } it { parsed_project.name.should eq("GitLab / api.gitlab.org") } it { parsed_project.gitlab_id.should eq(189) } - it { parsed_project.gitlab_url.should eq("http://localhost:3000/gitlab/api-gitlab-org") } + it { parsed_project.gitlab_url.should eq("http://demo.gitlab.com/gitlab/api-gitlab-org") } it "parses plain hash" do data = YAML.load(project_dump) |
