From 9a88e4d184e5959cb3b7212d027ae4bbe1c97302 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 5 Jan 2013 00:43:32 +0200 Subject: [PATCH] Fix some tests. Use travis-ci 1.9.2 --- .travis.yml | 2 +- spec/models/gitlab_ci_service_spec.rb | 4 ---- spec/models/note_spec.rb | 2 +- spec/models/project_spec.rb | 26 ++------------------------ spec/models/protected_branch_spec.rb | 2 +- spec/models/repository_spec.rb | 2 +- spec/requests/security/project_access_spec.rb | 8 ++++---- 7 files changed, 10 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59d22f32e..e8bd74426 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ branches: only: - 'master' rvm: - - 1.9.3 + - 1.9.2 services: - mysql - postgresql diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb index ec43d46b3..b86588af1 100644 --- a/spec/models/gitlab_ci_service_spec.rb +++ b/spec/models/gitlab_ci_service_spec.rb @@ -35,10 +35,6 @@ describe GitlabCiService do ) end - describe :commit_badge_path do - it { @service.commit_badge_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/status?sha=2ab7834c"} - end - describe :commit_status_path do it { @service.commit_status_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c/status.json?token=verySecret"} end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index d1df1c3ef..8e06e6748 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -77,7 +77,7 @@ describe Note do end let(:project) { create(:project) } - let(:commit) { project.commit } + let(:commit) { project.repository.commit } describe "Commit notes" do before do diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 6306c4b89..223b9d48c 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -97,11 +97,6 @@ describe Project do project.url_to_repo.should == Gitlab.config.gitolite.ssh_path_prefix + "somewhere.git" end - it "should return path to repo" do - project = Project.new(path: "somewhere") - project.path_to_repo.should == Rails.root.join("tmp", "repositories", "somewhere") - end - it "returns the full web URL for this repo" do project = Project.new(path: "somewhere") project.web_url.should == "#{Gitlab.config.gitlab.url}/somewhere" @@ -229,32 +224,15 @@ describe Project do end end - describe "#empty_repo?" do + describe :repository do let(:project) { create(:project) } - it "should return true if the repo doesn't exist" do - project.stub(repo_exists?: false, has_commits?: true) - project.should be_empty_repo - end - - it "should return true if the repo has commits" do - project.stub(repo_exists?: true, has_commits?: false) - project.should be_empty_repo - end - - it "should return false if the repo exists and has commits" do - project.stub(repo_exists?: true, has_commits?: true) - project.should_not be_empty_repo - end - end - - describe :repository do it "should return valid repo" do project.repository.should be_kind_of(Repository) end it "should return nil" do - Project.new(path: "invalid").repository.should be_nil + Project.new(path: "empty").repository.should be_nil end end end diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb index 7340ce50c..0835666a1 100644 --- a/spec/models/protected_branch_spec.rb +++ b/spec/models/protected_branch_spec.rb @@ -44,7 +44,7 @@ describe ProtectedBranch do let(:branch) { create(:protected_branch) } it 'commits itself to its project' do - branch.project.should_receive(:commit).with(branch.name) + branch.project.repository.should_receive(:commit).with(branch.name) branch.commit end end diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index e81816404..71f9b964e 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -30,7 +30,7 @@ describe Repository do end it "returns non-master when master exists but default branch is set to something else" do - repository.default_branch = 'stable' + repository.root_ref = 'stable' repository.should_receive(:branch_names).at_least(:once).and_return([stable, master]) repository.discover_default_branch.should == 'stable' end diff --git a/spec/requests/security/project_access_spec.rb b/spec/requests/security/project_access_spec.rb index 060a276b7..3aee8ba1d 100644 --- a/spec/requests/security/project_access_spec.rb +++ b/spec/requests/security/project_access_spec.rb @@ -22,10 +22,10 @@ describe "Application access" do before do # full access - project.users_projects.create(user: master, project_access: UsersProject::MASTER) + project.team << [master, :master] # readonly - project.users_projects.create(user: reporter, project_access: UsersProject::REPORTER) + project.team << [reporter, :reporter] end describe "GET /project_code" do @@ -62,7 +62,7 @@ describe "Application access" do end describe "GET /project_code/commit/:sha" do - subject { project_commit_path(project, project.commit) } + subject { project_commit_path(project, project.repository.commit) } it { should be_allowed_for master } it { should be_allowed_for reporter } @@ -107,7 +107,7 @@ describe "Application access" do describe "GET /project_code/blob" do before do - commit = project.commit + commit = project.repository.commit path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name @blob_path = project_blob_path(project, File.join(commit.id, path)) end -- 2.11.0