deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix tests after refactor

Browse source
This commit is contained in:
gitlabhq 2011-11-16 08:58:53 +03:00
parent af08ed6b66
commit a7734bba84
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
spec/requests/projects_security_spec.rb
View file

@ -36,13 +36,13 @@ describe "Projects" do
it { project_path(@project).should be_denied_for :visitor } it { project_path(@project).should be_denied_for :visitor }
end end
describe "GET /project_code/tree" do describe "GET /project_code/master/tree" do
it { tree_project_path(@project).should be_allowed_for @u1 } it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
it { tree_project_path(@project).should be_allowed_for @u3 } it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
it { tree_project_path(@project).should be_denied_for :admin } it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
it { tree_project_path(@project).should be_denied_for @u2 } it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
it { tree_project_path(@project).should be_denied_for :user } it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
it { tree_project_path(@project).should be_denied_for :visitor } it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
end end
describe "GET /project_code/commits" do describe "GET /project_code/commits" do
@ -85,7 +85,7 @@ describe "Projects" do
before do before do
@commit = @project.commit @commit = @project.commit
@path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
@blob_path = blob_project_path(@project, :commit_id => @commit.id, :path => @path) @blob_path = blob_project_ref_path(@project, @commit.id, :path => @path)
end end
it { @blob_path.should be_allowed_for @u1 } it { @blob_path.should be_allowed_for @u1 }

4
spec/requests/projects_tree_perfomance_spec.rb
View file

@ -14,7 +14,7 @@ describe "Projects" do
it "should be fast" do it "should be fast" do
time = Benchmark.realtime do time = Benchmark.realtime do
visit tree_project_path(@project) visit tree_project_ref_path(@project, @project.root_ref)
end end
(time < 1.0).should be_true (time < 1.0).should be_true
end end
@ -28,7 +28,7 @@ describe "Projects" do
it "should be fast" do it "should be fast" do
time = Benchmark.realtime do time = Benchmark.realtime do
visit tree_project_path(@project, :commit_id => ValidCommit::ID) visit tree_project_ref_path(@project, ValidCommit::ID)
end end
(time < 1.0).should be_true (time < 1.0).should be_true
end end

22
spec/requests/projects_tree_spec.rb
View file

@ -9,11 +9,11 @@ describe "Projects" do
@project = Factory :project @project = Factory :project
@project.add_access(@user, :read) @project.add_access(@user, :read)
visit tree_project_path(@project) visit tree_project_ref_path(@project, @project.root_ref)
end end
it "should be correct path" do it "should be correct path" do
current_path.should == tree_project_path(@project) current_path.should == tree_project_ref_path(@project, @project.root_ref)
end end
it_behaves_like :tree_view it_behaves_like :tree_view
@ -24,11 +24,11 @@ describe "Projects" do
@project = Factory :project @project = Factory :project
@project.add_access(@user, :read) @project.add_access(@user, :read)
visit tree_project_path(@project, :commit_id => ValidCommit::ID) visit tree_project_ref_path(@project, ValidCommit::ID)
end end
it "should be correct path" do it "should be correct path" do
current_path.should == tree_project_path(@project) current_path.should == tree_project_ref_path(@project, ValidCommit::ID)
end end
it_behaves_like :tree_view it_behaves_like :tree_view
@ -40,11 +40,11 @@ describe "Projects" do
@project = Factory :project @project = Factory :project
@project.add_access(@user, :read) @project.add_access(@user, :read)
visit tree_project_path(@project, :branch => "master") visit tree_project_ref_path(@project, @project.root_ref)
end end
it "should be correct path" do it "should be correct path" do
current_path.should == tree_project_path(@project) current_path.should == tree_project_ref_path(@project, @project.root_ref)
end end
it_behaves_like :tree_view it_behaves_like :tree_view
@ -57,11 +57,11 @@ describe "Projects" do
@project = Factory :project @project = Factory :project
@project.add_access(@user, :read) @project.add_access(@user, :read)
visit tree_project_path(@project, :path => ".rvmrc") visit tree_project_ref_path(@project, @project.root_ref, :path => ".rvmrc")
end end
it "should be correct path" do it "should be correct path" do
current_path.should == tree_project_path(@project) current_path.should == tree_project_ref_path(@project, @project.root_ref)
end end
it "should contain file view" do it "should contain file view" do
@ -76,13 +76,11 @@ describe "Projects" do
@project = Factory :project @project = Factory :project
@project.add_access(@user, :read) @project.add_access(@user, :read)
visit blob_project_path(@project, visit blob_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
:path => ValidCommit::BLOB_FILE_PATH,
:commit_id => ValidCommit::ID)
end end
it "should be correct path" do it "should be correct path" do
current_path.should == blob_project_path(@project) current_path.should == blob_project_ref_path(@project, ValidCommit::ID)
end end
it "raw file response" do it "raw file response" do