diff --git a/spec/controllers/projects/comments_controller_for_commit_spec.rb b/spec/controllers/projects/comments_controller_for_commit_spec.rb
index d3a364218..8c135ed99 100644
--- a/spec/controllers/projects/comments_controller_for_commit_spec.rb
+++ b/spec/controllers/projects/comments_controller_for_commit_spec.rb
@@ -8,7 +8,7 @@ end
 shared_examples_for 'user with create comment rights for commits' do
   it 'should be able to perform create action' do
     post :create, @create_params
-    response.should redirect_to(commit_path(@project, @commit.id))
+    response.should redirect_to(commit_path(@project, @commit.id)+"#comment#{Comment.last.id}")
   end
 
   it 'should create subscribe object into db' do
@@ -63,16 +63,16 @@ shared_examples_for 'user without destroy comment rights for commits' do
   end
 end
 
-#shared_examples_for 'user with destroy rights' do
-#  it 'should be able to perform destroy action' do
-#    delete :destroy, :id => @stranger_comment.id, :owner_name => @project.owner.uname, :project_name => @project.name
-#    response.should redirect_to(commit_path(@project, @commit.id))
-#  end
-#
-#  it 'should reduce comments count' do
-#    lambda{ delete :destroy, :id => @stranger_comment.id, :issue_id => @issue.serial_id, :owner_name => @project.owner.uname, :project_name => @project.name }.should change{ Comment.count }.by(-1)
-#  end
-#end
+shared_examples_for 'user with destroy comment rights for commits' do
+  it 'should be able to perform destroy action' do
+    delete :destroy, :id => @stranger_comment.id, :commit_id => @commit.id, :owner_name => @project.owner.uname, :project_name => @project.name
+    response.should redirect_to(commit_path(@project, @commit.id))
+  end
+
+  it 'should reduce comments count' do
+    lambda{ delete :destroy, :id => @stranger_comment.id, :commit_id => @commit.id, :owner_name => @project.owner.uname, :project_name => @project.name }.should change{ Comment.count }.by(-1)
+  end
+end
 
 describe Projects::CommentsController do
   before(:each) do
@@ -99,7 +99,7 @@ describe Projects::CommentsController do
     it_should_behave_like 'user with create comment rights for commits'
     it_should_behave_like 'user with update stranger comment rights for commits'
     it_should_behave_like 'user with update own comment rights for commits'
-    it_should_behave_like 'user without destroy comment rights for commits'
+    it_should_behave_like 'user with destroy comment rights for commits'
     #it_should_behave_like 'user with destroy rights'
   end
 
@@ -114,7 +114,7 @@ describe Projects::CommentsController do
    it_should_behave_like 'user with create comment rights for commits'
    it_should_behave_like 'user with update stranger comment rights for commits'
    it_should_behave_like 'user with update own comment rights for commits'
-   it_should_behave_like 'user without destroy comment rights for commits'
+   it_should_behave_like 'user with destroy comment rights for commits'
   end
 
   context 'for project reader user' do
diff --git a/spec/controllers/projects/comments_controller_spec.rb b/spec/controllers/projects/comments_controller_spec.rb
index 97a55982f..b81445a8b 100644
--- a/spec/controllers/projects/comments_controller_spec.rb
+++ b/spec/controllers/projects/comments_controller_spec.rb
@@ -24,7 +24,7 @@ end
 shared_examples_for 'user with create comment rights' do
   it 'should be able to perform create action' do
     post :create, @create_params
-    response.should redirect_to(project_issue_path(@project, @issue))
+    response.should redirect_to(project_issue_path(@project, @issue)+"#comment#{Comment.last.id}")
   end
 
   it 'should create comment in the database' do
@@ -113,7 +113,7 @@ describe Projects::CommentsController do
     it_should_behave_like 'user with create comment rights'
     it_should_behave_like 'user with update stranger comment rights'
     it_should_behave_like 'user with update own comment rights'
-    it_should_behave_like 'user without destroy comment rights'
+    it_should_behave_like 'user with destroy comment rights'
   end
 
   context 'for project owner user' do
@@ -124,7 +124,7 @@ describe Projects::CommentsController do
    it_should_behave_like 'user with create comment rights'
    it_should_behave_like 'user with update stranger comment rights'
    it_should_behave_like 'user with update own comment rights'
-   it_should_behave_like 'user without destroy comment rights'
+   it_should_behave_like 'user with destroy comment rights'
   end
 
   context 'for project reader user' do
diff --git a/spec/models/comment_for_commit_spec.rb b/spec/models/comment_for_commit_spec.rb
index c27479215..88ced5fe2 100644
--- a/spec/models/comment_for_commit_spec.rb
+++ b/spec/models/comment_for_commit_spec.rb
@@ -22,6 +22,17 @@ def set_comments_data_for_commit
   any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
 end
 
+def should_send_email(args={})
+  create_comment args[:commentor]
+  ActionMailer::Base.deliveries.count.should == 1
+  ActionMailer::Base.deliveries.last.to.include?(args[:receiver].email).should == true
+end
+
+def should_not_send_email(args={})
+  create_comment args[:commentor]
+  ActionMailer::Base.deliveries.count.should == 0
+end
+
 describe Comment do
   before { stub_symlink_methods }
   context 'for global admin user' do
@@ -32,25 +43,11 @@ describe Comment do
       set_comments_data_for_commit
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should destroy own comment' do
-      @ability.should be_able_to(:destroy, @comment)
-    end
-
-    it 'should destroy stranger comment' do
-      @ability.should be_able_to(:destroy, @stranger_comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
   end
 
   context 'for project admin user' do
@@ -65,53 +62,34 @@ describe Comment do
       ActionMailer::Base.deliveries = []
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
 
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
-    end
-
-    context 'for default settings' do
-      it 'should not send an e-mail' do
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
-      end
+    it 'should send an e-mail by default settings' do
+      should_send_email(commentor: @stranger, receiver: @user)
     end
 
     context 'for disabled notify setting new_comment_commit_repo_owner' do
-      it 'should not send an e-mail' do
+      it 'should send an e-mail' do
         @user.notifier.update_column :new_comment_commit_repo_owner, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
+        should_send_email(commentor: @stranger, receiver: @user)
       end
     end
 
     context 'for disabled notify setting new_comment_commit_owner' do
       it 'should send an e-mail' do
         @user.notifier.update_column :new_comment_commit_owner, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
+        should_send_email(commentor: @stranger, receiver: @user)
       end
     end
 
     context 'for disabled notify setting new_comment_commit_commentor' do
       it 'should send an e-mail' do
         @user.notifier.update_column :new_comment_commit_commentor, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
+        should_send_email(commentor: @stranger, receiver: @user)
       end
     end
 
@@ -120,27 +98,23 @@ describe Comment do
         @user.notifier.update_column :new_comment_commit_repo_owner, false
         @user.notifier.update_column :new_comment_commit_owner, false
         @user.notifier.update_column :new_comment_commit_commentor, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for unsubscribe commit' do
       it 'should not send an e-mail' do
         Subscribe.unsubscribe_from_commit @subscribe_params.merge(:user_id => @user.id)
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for disabled global notify setting' do
       it 'should not send an e-mail' do
         @user.notifier.update_column :can_notify, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
-
   end
 
   context 'for project owner user' do
@@ -155,27 +129,15 @@ describe Comment do
       ActionMailer::Base.deliveries = []
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
 
     context 'for default enabled settings' do
       it 'should send an e-mail by default settings' do
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@project.owner.email).should == true
+        should_send_email(commentor: @stranger, receiver: @project.owner)
       end
     end
 
@@ -183,26 +145,21 @@ describe Comment do
       it 'should not send an e-mail' do
         @user.notifier.update_column :new_comment_commit_repo_owner, false
         Comment.destroy_all
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for disabled notify setting new_comment_commit_owner' do
       it 'should send an e-mail' do
         @user.notifier.update_column :new_comment_commit_owner, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
+        should_send_email(commentor: @stranger, receiver: @user)
       end
     end
 
     context 'for disabled notify setting new_comment_commit_commentor' do
       it 'should send an e-mail' do
         @user.notifier.update_column :new_comment_commit_commentor, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
+        should_send_email(commentor: @stranger, receiver: @user)
       end
     end
 
@@ -211,36 +168,30 @@ describe Comment do
         @user.notifier.update_column :new_comment_commit_repo_owner, false
         @user.notifier.update_column :new_comment_commit_owner, false
         @user.notifier.update_column :new_comment_commit_commentor, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for unsubscribe project' do
       it 'should not send an e-mail' do
         Subscribe.unsubscribe_from_commit @subscribe_params.merge(:user_id => @user.id)
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for disabled global notify setting' do
       it 'should not send an e-mail' do
         @user.notifier.update_column :can_notify, false
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @stranger)
       end
     end
 
     context 'for own commit' do
       it 'should send a one e-mail' do
         @project.owner.update_column :email, 'code@tpope.net'
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@project.owner.email).should == true
+        should_send_email(commentor: @stranger, receiver: @project.owner)
       end
     end
-
   end
 
   context 'for simple user' do
@@ -255,86 +206,62 @@ describe Comment do
       Subscribe.unsubscribe_from_commit @subscribe_params.merge(:user_id => [@stranger.id, @project.owner.id])
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should not update stranger comment' do
-      @ability.should_not be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user without update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user without destroy stranger comment ability (for model)'
 
     context 'for default enabled settings' do
       it 'should send an e-mail' do
-        comment = create_comment(@stranger)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@simple.email).should == true
+        should_send_email(commentor: @stranger, receiver: @simple)
       end
 
       it 'should send an e-mail for comments after his comment' do
         comment = create_comment(@simple)
         ActionMailer::Base.deliveries = []
-        comment = create_comment(@user)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@simple.email).should == true
+        should_send_email(commentor: @stranger, receiver: @simple)
       end
 
       it 'should send an e-mail when subscribed to project' do
         Subscribe.subscribe_to_commit @subscribe_params.merge(:user_id => @simple.id)
-        comment = create_comment(@project.owner)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@simple.email).should == true
+        should_send_email(commentor: @project.owner, receiver: @simple)
       end
 
       it 'should not send an e-mail for own comment' do
-        comment = create_comment(@simple)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @simple)
       end
     end
 
     context 'for committer' do
       it 'should send an e-mail' do
         @simple.update_column :email, 'test@test.test'
-        comment = create_comment(@user)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@simple.email).should == true
+        should_send_email commentor: @stranger, receiver: @simple
       end
 
       it 'should send a one e-mail when subscribed to commit' do
         Subscribe.subscribe_to_commit @subscribe_params.merge(:user_id => @simple.id)
         @simple.update_column :email, 'test@test.test'
-        comment = create_comment(@user)
-        ActionMailer::Base.deliveries.count.should == 1
-        ActionMailer::Base.deliveries.last.to.include?(@simple.email).should == true
+        should_send_email(commentor: @stranger, receiver: @simple)
       end
 
       it 'should not send an e-mail for own comment' do
         @simple.update_column :email, 'test@test.test'
-        comment = create_comment(@simple)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @simple)
       end
 
       it 'should not send an e-mail if global notify off' do
         @project.owner.notifier.update_column :can_notify, false
         @simple.update_column :email, 'test@test.test'
         @simple.notifier.update_column :can_notify, false
-        comment = create_comment(@user)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @user)
       end
 
       it 'should not send an e-mail if notify for my commits off' do
         Comment.destroy_all
         @simple.notifier.update_column :new_comment_commit_owner, false
         @simple.update_column :email, 'test@test.test'
-        comment = create_comment(@user)
-        ActionMailer::Base.deliveries.count.should == 0
+        should_not_send_email(commentor: @user)
       end
     end
   end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 6afc22242..93e1dfc35 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -24,29 +24,11 @@ describe Comment do
       set_commentable_data
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    pending "sends an e-mail" do
-      ActionMailer::Base.deliveries.last.to.include?(@stranger.email).should == true
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should destroy own comment' do
-      @ability.should be_able_to(:destroy, @comment)
-    end
-
-    it 'should destroy stranger comment' do
-      @ability.should be_able_to(:destroy, @stranger_comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
   end
 
   context 'for project admin user' do
@@ -59,21 +41,14 @@ describe Comment do
       @project.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
     end
 
-    it 'should create comment' do
-      @comment.user = @user
-      @ability.should be_able_to(:create, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
 
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
+    pending "sends an e-mail" do
+      ActionMailer::Base.deliveries.last.to.include?(@stranger.email).should == true
     end
   end
 
@@ -89,21 +64,11 @@ describe Comment do
       @project.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should update stranger comment' do
-      @ability.should be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user with update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user with destroy stranger comment ability (for model)'
   end
 
   context 'for simple user' do
@@ -114,21 +79,11 @@ describe Comment do
       set_commentable_data
     end
 
-    it 'should create comment' do
-      @ability.should be_able_to(:create, @comment)
-    end
-
-    it 'should update comment' do
-      @ability.should be_able_to(:update, @comment)
-    end
-
-    it 'should not update stranger comment' do
-      @ability.should_not be_able_to(:update, @stranger_comment)
-    end
-
-    it 'should not destroy comment' do
-      @ability.should_not be_able_to(:destroy, @comment)
-    end
+    it_should_behave_like 'user with create comment ability (for model)'
+    it_should_behave_like 'user with update own comment ability (for model)'
+    it_should_behave_like 'user without update stranger comment ability (for model)'
+    it_should_behave_like 'user with destroy comment ability (for model)'
+    it_should_behave_like 'user without destroy stranger comment ability (for model)'
 
     context 'with mass assignment' do
       it 'should not be able to update commentable' do
@@ -145,6 +100,5 @@ describe Comment do
         @comment.should_not allow_mass_assignment_of :project_id
       end
     end
-
   end
 end
diff --git a/spec/support/shared_examples/comments.rb b/spec/support/shared_examples/comments.rb
new file mode 100644
index 000000000..9080eb85e
--- /dev/null
+++ b/spec/support/shared_examples/comments.rb
@@ -0,0 +1,45 @@
+# -*- encoding : utf-8 -*-
+shared_examples_for 'user with create comment ability (for model)' do
+  it 'should create comment' do
+    @ability.should be_able_to(:create, @comment)
+  end
+end
+shared_examples_for 'user with update own comment ability (for model)' do
+  it 'should update comment' do
+    @ability.should be_able_to(:update, @comment)
+  end
+end
+shared_examples_for 'user with update stranger comment ability (for model)' do
+  it 'should update stranger comment' do
+    @ability.should be_able_to(:update, @stranger_comment)
+  end
+end
+shared_examples_for 'user with destroy comment ability (for model)' do
+  it 'should destroy own comment' do
+    @ability.should be_able_to(:destroy, @comment)
+  end
+end
+shared_examples_for 'user with destroy stranger comment ability (for model)' do
+  it 'should destroy stranger comment' do
+    @ability.should be_able_to(:destroy, @stranger_comment)
+  end
+end
+
+shared_examples_for 'user without update stranger comment ability (for model)' do
+  it 'should not update stranger comment' do
+    @ability.should_not be_able_to(:update, @stranger_comment)
+  end
+end
+shared_examples_for 'user without destroy stranger comment ability (for model)' do
+  it 'should not destroy stranger comment' do
+    @ability.should_not be_able_to(:destroy, @stranger_comment)
+  end
+end
+
+shared_examples_for 'by default settings' do
+  it 'should send an e-mail' do
+    comment = create_comment(@stranger)
+    ActionMailer::Base.deliveries.count.should == 1
+    ActionMailer::Base.deliveries.last.to.include?(@user.email).should == true
+  end
+end