Commit 211c06e4191395d7c23a9a523ef232506d786ab6
1 parent
6ddacaf9
Exists in
master
and in
4 other branches
Fix few test and notify for commit author
Showing
3 changed files
with
4 additions
and
2 deletions
Show diff stats
app/mailers/notify.rb
| @@ -68,7 +68,7 @@ class Notify < ActionMailer::Base | @@ -68,7 +68,7 @@ class Notify < ActionMailer::Base | ||
| 68 | @commit = @note.noteable | 68 | @commit = @note.noteable |
| 69 | @commit = CommitDecorator.decorate(@commit) | 69 | @commit = CommitDecorator.decorate(@commit) |
| 70 | @project = @note.project | 70 | @project = @note.project |
| 71 | - mail(to: recipient(commit_autor_email), subject: subject("note for commit #{@commit.short_id}", @commit.title)) | 71 | + mail(to: commit_autor_email, subject: subject("note for commit #{@commit.short_id}", @commit.title)) |
| 72 | end | 72 | end |
| 73 | 73 | ||
| 74 | def note_issue_email(recipient_id, note_id) | 74 | def note_issue_email(recipient_id, note_id) |
features/steps/project/project_browse_git_repo.rb
| @@ -14,6 +14,6 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps | @@ -14,6 +14,6 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps | ||
| 14 | Then 'I should see git file blame' do | 14 | Then 'I should see git file blame' do |
| 15 | page.should have_content "rubygems.org" | 15 | page.should have_content "rubygems.org" |
| 16 | page.should have_content "Dmitriy Zaporozhets" | 16 | page.should have_content "Dmitriy Zaporozhets" |
| 17 | - page.should have_content "bc3735004cb Moving to rails 3.2" | 17 | + page.should have_content "Moving to rails 3.2" |
| 18 | end | 18 | end |
| 19 | end | 19 | end |
features/steps/shared/note.rb
| @@ -2,6 +2,7 @@ module SharedNote | @@ -2,6 +2,7 @@ module SharedNote | ||
| 2 | include Spinach::DSL | 2 | include Spinach::DSL |
| 3 | 3 | ||
| 4 | Given 'I delete a comment' do | 4 | Given 'I delete a comment' do |
| 5 | + sleep 1 | ||
| 5 | first(".js-note-delete").trigger("click") | 6 | first(".js-note-delete").trigger("click") |
| 6 | end | 7 | end |
| 7 | 8 | ||
| @@ -15,6 +16,7 @@ module SharedNote | @@ -15,6 +16,7 @@ module SharedNote | ||
| 15 | within(".js-main-target-form") do | 16 | within(".js-main-target-form") do |
| 16 | fill_in "note[note]", with: "XML attached" | 17 | fill_in "note[note]", with: "XML attached" |
| 17 | click_button "Add Comment" | 18 | click_button "Add Comment" |
| 19 | + sleep 0.05 | ||
| 18 | end | 20 | end |
| 19 | end | 21 | end |
| 20 | 22 |