summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-05-12 06:59:16 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-05-12 06:59:16 +1100
commitfe7dc0c7006c1f0a0e9e9e799e1e355a8113b926 (patch)
tree6a561406b248eb89d8a60b82f0220fba4b41c263
parenteec1bdfa12d1e7ace9b72b85064af6bf8693a4dc (diff)
downloadgitlab-ce-blackst0ne-replace-spinach-project-commits-diff-comments.feature.tar.gz
-rw-r--r--spec/features/projects/commit/comments/user_adds_comment_spec.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/features/projects/commit/comments/user_adds_comment_spec.rb b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
index 18917bec6d0..6397df086a7 100644
--- a/spec/features/projects/commit/comments/user_adds_comment_spec.rb
+++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
@@ -20,12 +20,12 @@ describe "User adds a comment on a commit", :js do
end
it "adds a comment" do
- EMOJI = ":+1:".freeze
-
page.within(".js-main-target-form") do
expect(page).not_to have_link("Cancel")
- fill_in("note[note]", with: "#{comment_text} #{EMOJI}")
+ emoji = ":+1:"
+
+ fill_in("note[note]", with: "#{comment_text} #{emoji}")
# Check on `Preview` tab
click_link("Preview")
@@ -36,7 +36,7 @@ describe "User adds a comment on a commit", :js do
# Check on the `Write` tab
click_link("Write")
- expect(page).to have_field("note[note]", with: "#{comment_text} #{EMOJI}")
+ expect(page).to have_field("note[note]", with: "#{comment_text} #{emoji}")
# Submit comment from the `Preview` tab to get rid of a separate `it` block
# which would specially tests if everything gets cleared from the note form.
@@ -127,32 +127,32 @@ describe "User adds a comment on a commit", :js do
end
it "adds a comment" do
- NEW_COMMENT = "New comment".freeze
- OLD_COMMENT = "Old comment".freeze
+ new_comment = "New comment"
+ old_comment = "Old comment"
# Left side.
click_parallel_diff_line(sample_commit.del_line_code)
page.within(".diff-file:nth-of-type(1) form[data-line-code='#{sample_commit.del_line_code}']") do
- fill_in("note[note]", with: OLD_COMMENT)
+ fill_in("note[note]", with: old_comment)
click_button("Comment")
end
page.within(".diff-file:nth-of-type(1) .notes_content.parallel.old") do
- expect(page).to have_content(OLD_COMMENT)
+ expect(page).to have_content(old_comment)
end
# Right side.
click_parallel_diff_line(sample_commit.line_code)
page.within(".diff-file:nth-of-type(1) form[data-line-code='#{sample_commit.line_code}']") do
- fill_in("note[note]", with: NEW_COMMENT)
+ fill_in("note[note]", with: new_comment)
click_button("Comment")
end
wait_for_requests
- expect(all(".diff-file:nth-of-type(1) .notes_content.parallel.new")[1].text).to have_content(NEW_COMMENT)
+ expect(all(".diff-file:nth-of-type(1) .notes_content.parallel.new")[1].text).to have_content(new_comment)
end
end