diff options
| -rw-r--r-- | features/project/commits/commit_diff_comments.feature | 7 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/features/project/commits/commit_diff_comments.feature b/features/project/commits/commit_diff_comments.feature index 884fab527f5..b26019f832f 100644 --- a/features/project/commits/commit_diff_comments.feature +++ b/features/project/commits/commit_diff_comments.feature @@ -83,10 +83,3 @@ Feature: Comments on commit diffs And I submit the diff comment Then I should not see the diff comment form And I should see a discussion reply button - - - #@wip @javascript - #Scenario: I can delete a discussion comment - # Given I leave a diff comment like "Typo, please fix" - # And I delete a diff comment - # Then I should not see a diff comment saying "Typo, please fix" diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 8a9c287158c..e40769824cd 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -110,7 +110,7 @@ describe Project do describe 'last_activity_date' do it 'returns the creation date of the project\'s last event if present' do last_activity_event = create(:event, project: project) - project.last_activity_date.to_s(:db).should == last_event.created_at.to_s(:db) + project.last_activity_at.to_i.should == last_event.created_at.to_i end it 'returns the project\'s last update date if it has no events' do |