summaryrefslogtreecommitdiff
path: root/spec/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-06 12:08:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-06 12:08:38 +0000
commit6ab9cdec264a9caf7e4eb5519fcae5ac65a18b15 (patch)
tree28afca02f01c1b9d22a5e4227521a575fae57bea /spec/views
parent497d517e130ac88cbdee69c4c9e88938e164fc52 (diff)
downloadgitlab-ce-6ab9cdec264a9caf7e4eb5519fcae5ac65a18b15.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/groups/edit.html.haml_spec.rb2
-rw-r--r--spec/views/profiles/preferences/show.html.haml_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/views/groups/edit.html.haml_spec.rb b/spec/views/groups/edit.html.haml_spec.rb
index 83623ea7bb4..f40b03fda2a 100644
--- a/spec/views/groups/edit.html.haml_spec.rb
+++ b/spec/views/groups/edit.html.haml_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe 'groups/edit.html.haml' do
expect(rendered).to have_content("Prevent sharing a project within #{test_group.name} with other groups")
expect(rendered).to have_css('.js-descr', text: 'help text here')
- expect(rendered).to have_field('group_share_with_group_lock', checkbox_options)
+ expect(rendered).to have_field('group_share_with_group_lock', **checkbox_options)
end
end
diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb
index 1dae953227d..aab50209953 100644
--- a/spec/views/profiles/preferences/show.html.haml_spec.rb
+++ b/spec/views/profiles/preferences/show.html.haml_spec.rb
@@ -75,7 +75,7 @@ RSpec.describe 'profiles/preferences/show' do
end
def have_integrations_section
- have_css('#integrations.profile-settings-sidebar', { text: 'Integrations' })
+ have_css('#integrations.profile-settings-sidebar', text: 'Integrations')
end
before do