Commit e3d7ce2c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Tests are fixed now

parent fdbde884fd91
......@@ -47,6 +47,12 @@
.event-info {
color: #666;
}
.event-note {
padding-top: 5px;
padding-left: 5px;
display: inline-block;
color: #777;
}
}
.avatar {
position: relative;
......
......@@ -101,7 +101,7 @@ def destroy
return access_denied! unless can?(current_user, :remove_project, project)
# Delete team first in order to prevent multiple gitolite calls
project.truncate_team
project.team.truncate
project.destroy
......
......@@ -11,18 +11,18 @@
.input
= f.text_field :name, placeholder: "Example Project", class: "xxlarge"
%fieldset.adv_settings
%legend Advanced settings:
.clearfix
= f.label :path do
Path
.input
= text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
- if project.repo_exists?
%fieldset.adv_settings
%legend Advanced settings:
.clearfix
= f.label :path do
Path
.input
= text_field_tag :ppath, @project.repository.path_to_repo, class: "xlarge", disabled: true
- if project.repo_exists?
.clearfix
= f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, repository.heads.map(&:name), {}, style: "width:210px;")
.input= f.select(:default_branch, @project.repository.heads.map(&:name), {}, style: "width:210px;")
%fieldset.adv_settings
%legend Features:
......
......@@ -19,7 +19,6 @@
= event.project_name
.event-body
%span.hint
 
%i.icon-comment
%span.event-note
%i.icon-comment-alt
= truncate event.target.note, length: 70
......@@ -40,7 +40,7 @@
let!(:merge_request) { create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
merge_request.stub(:commits) { [merge_request.project.repository.commit] }
create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
create(:note, noteable: merge_request)
end
......
......@@ -39,13 +39,4 @@
branch.destroy
end
end
describe '#commit' do
let(:branch) { create(:protected_branch) }
it 'commits itself to its project' do
branch.project.repository.should_receive(:commit).with(branch.name)
branch.commit
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment