Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7bf8d22f
Commit
7bf8d22f
authored
Sep 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove commented tests since nobody is going to fix them
parent
13fec18a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
71 deletions
+0
-71
features/project/forked_merge_requests.feature
features/project/forked_merge_requests.feature
+0
-9
features/project/issues/issues.feature
features/project/issues/issues.feature
+0
-17
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+0
-45
No files found.
features/project/forked_merge_requests.feature
View file @
7bf8d22f
...
@@ -4,15 +4,6 @@ Feature: Project Forked Merge Requests
...
@@ -4,15 +4,6 @@ Feature: Project Forked Merge Requests
And
I am a member of project
"Shop"
And
I am a member of project
"Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
# TODO: fix
#@javascript
#Scenario: I can visit the target projects commit for a forked merge request
#Given I visit project "Forked Shop" merge requests page
#And I click link "New Merge Request"
#And I fill out a "Merge Request On Forked Project" merge request
#And I follow the target commit link
#Then I should see the commit under the forked from project
@javascript
@javascript
Scenario
:
I
submit new unassigned merge request to a forked project
Scenario
:
I
submit new unassigned merge request to a forked project
Given
I visit project
"Forked Shop"
merge requests page
Given
I visit project
"Forked Shop"
merge requests page
...
...
features/project/issues/issues.feature
View file @
7bf8d22f
...
@@ -54,20 +54,3 @@ Feature: Project Issues
...
@@ -54,20 +54,3 @@ Feature: Project Issues
And
I fill in issue search with
"0.3"
And
I fill in issue search with
"0.3"
Then
I should see
"Release 0.3"
in issues
Then
I should see
"Release 0.3"
in issues
And
I should not see
"Release 0.4"
in issues
And
I should not see
"Release 0.4"
in issues
# Disable this two cause of random failing
# TODO: fix after v4.0 released
#@javascript
#Scenario: I create Issue with pre-selected milestone
#Given project "Shop" has milestone "v2.2"
#And project "Shop" has milestone "v3.0"
#And I visit project "Shop" issues page
#When I select milestone "v3.0"
#And I click link "New Issue"
#Then I should see selected milestone with title "v3.0"
#@javascript
#Scenario: I create Issue with pre-selected assignee
#When I select first assignee from "Shop" project
#And I click link "New Issue"
#Then I should see first assignee from "Shop" as selected assignee
spec/features/notes_on_merge_requests_spec.rb
View file @
7bf8d22f
...
@@ -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
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
end
end
end
end
# TODO: fix
#it 'should check if previews were rendered separately' do
#within("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder") do
#should have_css(".js-note-preview", text: "One comment on line 185")
#end
#within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
#should have_css(".js-note-preview", text: "Another comment on line 17")
#end
#end
end
end
describe
"posting a note"
do
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
should
have_css
(
".notes_holder .note"
,
count:
1
)
should
have_css
(
".notes_holder .note"
,
count:
1
)
should
have_link
(
"Reply"
)
should
have_link
(
"Reply"
)
end
end
end
# TODO: fix
end
#it "should remove last note of a discussion" do
# within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .notes-holder") do
# find(".js-note-delete").click
# end
# should_not have_css(".note_holder")
#end
end
end
# TODO: fix
#describe "when replying to a note" do
#before do
## create first note
# find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184"]').click
# within(".js-temp-notes-holder") do
# fill_in "note[note]", with: "One comment on line 184"
# click_button("Add Comment")
#end
# within(".js-temp-notes-holder") do
# find(".js-discussion-reply-button").click
# fill_in "note[note]", with: "An additional comment in reply"
# click_button("Add Comment")
# end
#end
#it 'should be inserted and form removed from reply' do
# should have_content("An additional comment in reply")
# within(".notes_holder") { should have_css(".note", count: 2) }
# within(".notes_holder") { should have_no_css("form") }
# within(".notes_holder") { should have_link("Reply") }
# end
#end
end
end
describe
"On merge request discussion"
,
js:
true
do
describe
"On merge request discussion"
,
js:
true
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment