Commit 7bf8d22f178d5628e9c2dc8e79ec94a016e1d69b
1 parent
13fec18a
Exists in
master
and in
4 other branches
Remove commented tests since nobody is going to fix them
Showing
3 changed files
with
0 additions
and
71 deletions
Show diff stats
features/project/forked_merge_requests.feature
| @@ -4,15 +4,6 @@ Feature: Project Forked Merge Requests | @@ -4,15 +4,6 @@ Feature: Project Forked Merge Requests | ||
| 4 | And I am a member of project "Shop" | 4 | And I am a member of project "Shop" |
| 5 | And I have a project forked off of "Shop" called "Forked Shop" | 5 | And I have a project forked off of "Shop" called "Forked Shop" |
| 6 | 6 | ||
| 7 | - # TODO: fix | ||
| 8 | - #@javascript | ||
| 9 | - #Scenario: I can visit the target projects commit for a forked merge request | ||
| 10 | - #Given I visit project "Forked Shop" merge requests page | ||
| 11 | - #And I click link "New Merge Request" | ||
| 12 | - #And I fill out a "Merge Request On Forked Project" merge request | ||
| 13 | - #And I follow the target commit link | ||
| 14 | - #Then I should see the commit under the forked from project | ||
| 15 | - | ||
| 16 | @javascript | 7 | @javascript |
| 17 | Scenario: I submit new unassigned merge request to a forked project | 8 | Scenario: I submit new unassigned merge request to a forked project |
| 18 | Given I visit project "Forked Shop" merge requests page | 9 | Given I visit project "Forked Shop" merge requests page |
features/project/issues/issues.feature
| @@ -54,20 +54,3 @@ Feature: Project Issues | @@ -54,20 +54,3 @@ Feature: Project Issues | ||
| 54 | And I fill in issue search with "0.3" | 54 | And I fill in issue search with "0.3" |
| 55 | Then I should see "Release 0.3" in issues | 55 | Then I should see "Release 0.3" in issues |
| 56 | And I should not see "Release 0.4" in issues | 56 | And I should not see "Release 0.4" in issues |
| 57 | - | ||
| 58 | - # Disable this two cause of random failing | ||
| 59 | - # TODO: fix after v4.0 released | ||
| 60 | - #@javascript | ||
| 61 | - #Scenario: I create Issue with pre-selected milestone | ||
| 62 | - #Given project "Shop" has milestone "v2.2" | ||
| 63 | - #And project "Shop" has milestone "v3.0" | ||
| 64 | - #And I visit project "Shop" issues page | ||
| 65 | - #When I select milestone "v3.0" | ||
| 66 | - #And I click link "New Issue" | ||
| 67 | - #Then I should see selected milestone with title "v3.0" | ||
| 68 | - | ||
| 69 | - #@javascript | ||
| 70 | - #Scenario: I create Issue with pre-selected assignee | ||
| 71 | - #When I select first assignee from "Shop" project | ||
| 72 | - #And I click link "New Issue" | ||
| 73 | - #Then I should see first assignee from "Shop" as selected assignee |
spec/features/notes_on_merge_requests_spec.rb
| @@ -206,17 +206,6 @@ describe "On a merge request diff", js: true, focus: true do | @@ -206,17 +206,6 @@ describe "On a merge request diff", js: true, focus: true do | ||
| 206 | find(".js-note-preview-button").trigger("click") | 206 | find(".js-note-preview-button").trigger("click") |
| 207 | end | 207 | end |
| 208 | end | 208 | end |
| 209 | - | ||
| 210 | - # TODO: fix | ||
| 211 | - #it 'should check if previews were rendered separately' do | ||
| 212 | - #within("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder") do | ||
| 213 | - #should have_css(".js-note-preview", text: "One comment on line 185") | ||
| 214 | - #end | ||
| 215 | - | ||
| 216 | - #within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do | ||
| 217 | - #should have_css(".js-note-preview", text: "Another comment on line 17") | ||
| 218 | - #end | ||
| 219 | - #end | ||
| 220 | end | 209 | end |
| 221 | 210 | ||
| 222 | describe "posting a note" do | 211 | describe "posting a note" do |
| @@ -239,42 +228,8 @@ describe "On a merge request diff", js: true, focus: true do | @@ -239,42 +228,8 @@ describe "On a merge request diff", js: true, focus: true do | ||
| 239 | should have_css(".notes_holder .note", count: 1) | 228 | should have_css(".notes_holder .note", count: 1) |
| 240 | should have_link("Reply") | 229 | should have_link("Reply") |
| 241 | end | 230 | end |
| 242 | - | ||
| 243 | - # TODO: fix | ||
| 244 | - #it "should remove last note of a discussion" do | ||
| 245 | - # within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .notes-holder") do | ||
| 246 | - # find(".js-note-delete").click | ||
| 247 | - # end | ||
| 248 | - # should_not have_css(".note_holder") | ||
| 249 | - #end | ||
| 250 | end | 231 | end |
| 251 | end | 232 | end |
| 252 | - | ||
| 253 | - # TODO: fix | ||
| 254 | - #describe "when replying to a note" do | ||
| 255 | - #before do | ||
| 256 | - ## create first note | ||
| 257 | - # find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184"]').click | ||
| 258 | - | ||
| 259 | - # within(".js-temp-notes-holder") do | ||
| 260 | - # fill_in "note[note]", with: "One comment on line 184" | ||
| 261 | - # click_button("Add Comment") | ||
| 262 | - #end | ||
| 263 | - | ||
| 264 | - # within(".js-temp-notes-holder") do | ||
| 265 | - # find(".js-discussion-reply-button").click | ||
| 266 | - # fill_in "note[note]", with: "An additional comment in reply" | ||
| 267 | - # click_button("Add Comment") | ||
| 268 | - # end | ||
| 269 | - #end | ||
| 270 | - | ||
| 271 | - #it 'should be inserted and form removed from reply' do | ||
| 272 | - # should have_content("An additional comment in reply") | ||
| 273 | - # within(".notes_holder") { should have_css(".note", count: 2) } | ||
| 274 | - # within(".notes_holder") { should have_no_css("form") } | ||
| 275 | - # within(".notes_holder") { should have_link("Reply") } | ||
| 276 | - # end | ||
| 277 | - #end | ||
| 278 | end | 233 | end |
| 279 | 234 | ||
| 280 | describe "On merge request discussion", js: true do | 235 | describe "On merge request discussion", js: true do |