Commit 4fcd89fe7fb44da5c9bbdcca89bfbbffa5d0b032
1 parent
e2305519
Exists in
master
and in
4 other branches
Fixed random failing test
Showing
2 changed files
with
1 additions
and
8 deletions
Show diff stats
features/project/commits/commit_diff_comments.feature
| @@ -83,10 +83,3 @@ Feature: Comments on commit diffs | @@ -83,10 +83,3 @@ Feature: Comments on commit diffs | ||
| 83 | And I submit the diff comment | 83 | And I submit the diff comment |
| 84 | Then I should not see the diff comment form | 84 | Then I should not see the diff comment form |
| 85 | And I should see a discussion reply button | 85 | And I should see a discussion reply button |
| 86 | - | ||
| 87 | - | ||
| 88 | - #@wip @javascript | ||
| 89 | - #Scenario: I can delete a discussion comment | ||
| 90 | - # Given I leave a diff comment like "Typo, please fix" | ||
| 91 | - # And I delete a diff comment | ||
| 92 | - # Then I should not see a diff comment saying "Typo, please fix" |
spec/models/project_spec.rb
| @@ -110,7 +110,7 @@ describe Project do | @@ -110,7 +110,7 @@ describe Project do | ||
| 110 | describe 'last_activity_date' do | 110 | describe 'last_activity_date' do |
| 111 | it 'returns the creation date of the project\'s last event if present' do | 111 | it 'returns the creation date of the project\'s last event if present' do |
| 112 | last_activity_event = create(:event, project: project) | 112 | last_activity_event = create(:event, project: project) |
| 113 | - project.last_activity_date.to_s(:db).should == last_event.created_at.to_s(:db) | 113 | + project.last_activity_at.to_i.should == last_event.created_at.to_i |
| 114 | end | 114 | end |
| 115 | 115 | ||
| 116 | it 'returns the project\'s last update date if it has no events' do | 116 | it 'returns the project\'s last update date if it has no events' do |