diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-03-07 15:24:27 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-03-07 15:33:26 -0500 |
commit | 56c4f22c80b0555d5d7cfbc7f443122a8b70072c (patch) | |
tree | 952387e1f8921e0bf98a239ac35ff4164a3dd446 | |
parent | 903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4 (diff) | |
download | gitlab-ce-56c4f22c80b0555d5d7cfbc7f443122a8b70072c.tar.gz |
Remove redundant integration tests
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.
This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
-rw-r--r-- | features/project/issues/issues.feature | 8 | ||||
-rw-r--r-- | features/project/merge_requests.feature | 19 | ||||
-rw-r--r-- | features/steps/project/issues/issues.rb | 4 | ||||
-rw-r--r-- | features/steps/project/merge_requests.rb | 8 | ||||
-rw-r--r-- | features/steps/shared/note.rb | 7 | ||||
-rw-r--r-- | spec/models/note_spec.rb | 2 |
6 files changed, 1 insertions, 47 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 89af58dcef3..ff21c7d1b83 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -59,14 +59,6 @@ Feature: Project Issues And I should see an error alert section within the comment form @javascript - Scenario: Visiting Issues after leaving a comment - Given I visit issue page "Release 0.4" - And I leave a comment like "XML attached" - And I visit project "Shop" issues page - And I sort the list by "Last updated" - Then I should see "Release 0.4" at the top - - @javascript Scenario: Visiting Issues after being sorted the list Given I visit project "Shop" issues page And I sort the list by "Oldest updated" diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index a69089f00c4..f8d9fe1854d 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -87,15 +87,6 @@ Feature: Project Merge Requests Then I should see comment "XML attached" @javascript - Scenario: Visiting Merge Requests after leaving a comment - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - And I visit merge request page "Bug NS-04" - And I leave a comment like "XML attached" - And I visit project "Shop" merge requests page - And I sort the list by "Last updated" - Then I should see "Bug NS-04" at the top - - @javascript Scenario: Visiting Merge Requests after being sorted the list Given I visit project "Shop" merge requests page And I sort the list by "Oldest updated" @@ -129,16 +120,6 @@ Feature: Project Merge Requests Then The list should be sorted by "Least popular" @javascript - Scenario: Visiting Merge Requests after commenting on diffs - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - And I visit merge request page "Bug NS-05" - And I click on the Changes tab - And I leave a comment like "Line is wrong" on diff - And I visit project "Shop" merge requests page - And I sort the list by "Last updated" - Then I should see "Bug NS-05" at the top - - @javascript Scenario: I comment on a merge request diff Given project "Shop" have "Bug NS-05" open merge request with diffs inside And I visit merge request page "Bug NS-05" diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 565bf088b41..d9842ccf95e 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -355,10 +355,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end end - step 'I should see "Release 0.4" at the top' do - expect(page.find('ul.content-list.issues-list li.issue:first-child')).to have_content("Release 0.4") - end - def filter_issue(text) fill_in 'issue_search', with: text end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 8bf423cc64b..c19b15bc9ed 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -517,14 +517,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end end - step 'I should see "Bug NS-05" at the top' do - expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-05") - end - - step 'I should see "Bug NS-04" at the top' do - expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-04") - end - def merge_request @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05") end diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb index eb6df61b8e6..444d6726f99 100644 --- a/features/steps/shared/note.rb +++ b/features/steps/shared/note.rb @@ -144,11 +144,4 @@ module SharedNote expect(page).to have_content("+1 Awesome!") end end - - step 'I sort the list by "Last updated"' do - find('button.dropdown-toggle.btn').click - page.within('ul.dropdown-menu.dropdown-menu-align-right li') do - click_link "Last updated" - end - end end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 583937ca748..33085dac4ea 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -24,7 +24,7 @@ require 'spec_helper' describe Note, models: true do describe 'associations' do it { is_expected.to belong_to(:project) } - it { is_expected.to belong_to(:noteable) } + it { is_expected.to belong_to(:noteable).touch(true) } it { is_expected.to belong_to(:author).class_name('User') } it { is_expected.to have_many(:todos).dependent(:destroy) } |