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

Merge branch 'project_activities'

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-05 20:16:41 +02:00
commit 70efc014e9
7 changed files with 105 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/requests/projects_spec.rb
View file

@ -78,13 +78,14 @@ describe "Projects" do
current_path.should == project_path(@project)
end
it "should beahave like activities page" do
within ".project-update" do
page.should have_content("master")
page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message)
end
end
# TODO: replace with real one
#it "should beahave like activities page" do
#within ".project-update" do
#page.should have_content("master")
#page.should have_content(@project.commit.author.name)
#page.should have_content(@project.commit.safe_message)
#end
#end
end
describe "GET /projects/team" do

2
spec/requests/repositories_spec.rb
View file

@ -28,7 +28,7 @@ describe "Repository" do
end
it "should show commits list" do
page.all(:css, ".project-update").size.should == 20
page.all(:css, ".project-update").size.should == @project.repo.branches.size
end
end