Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-12 19:20:55 +0300
committerPhil Hughes <me@iamphill.com>2019-04-12 19:20:55 +0300
commitad9b2c62286294a659a4d92f60f7e3899d8f8b82 (patch)
tree4aff21b7bd9ad4ee63e7081af13c292aef58d071 /spec/features
parentde44f3e176a1891238f5c79ef5203ab06cbe6927 (diff)
parente68f94cda77d4039a15c74dd94a528966cef0557 (diff)
Merge branch 'gt-fix-styling-for-framework-notes' into 'master'
Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59868 See merge request gitlab-org/gitlab-ce!26877
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/commit/comments/user_adds_comment_spec.rb4
1 files changed, 2 insertions, 2 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 29442a58ea4..586e2e33112 100644
--- a/spec/features/projects/commit/comments/user_adds_comment_spec.rb
+++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
@@ -138,7 +138,7 @@ describe "User adds a comment on a commit", :js do
click_button("Comment")
end
- page.within(".diff-file:nth-of-type(1) .notes_content.parallel.old") do
+ page.within(".diff-file:nth-of-type(1) .notes-content.parallel.old") do
expect(page).to have_content(old_comment)
end
@@ -152,7 +152,7 @@ describe "User adds a comment on a commit", :js do
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