diff --git a/Gemfile b/Gemfile index 949802ec510c84b9575ffa65d75e4d5ea2727b58..551cbd9d229e9ff9b6f16d6343bcc8f55e2eb152 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.11.0' +gem 'hamlit', '~> 2.14.2' # Files attachments gem 'carrierwave', '~> 1.3' diff --git a/Gemfile.lock b/Gemfile.lock index 974bc4181f17de7284921fe548a3445423fc64fb..ee5cbc7e2a0b6199b49e3f9f4243e7404de8e796 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.11.0) + hamlit (2.14.2) temple (>= 0.8.2) thor tilt @@ -1388,7 +1388,7 @@ DEPENDENCIES gssapi guard-rspec haml_lint (~> 0.36.0) - hamlit (~> 2.11.0) + hamlit (~> 2.14.2) hangouts-chat (~> 0.0.5) hashie hashie-forbidden_attributes diff --git a/changelogs/unreleased/sh-update-hamlit-for-gc.yml b/changelogs/unreleased/sh-update-hamlit-for-gc.yml new file mode 100644 index 0000000000000000000000000000000000000000..abfb61e0ba7a36518d8ee4ebd6e62e9d48a52c82 --- /dev/null +++ b/changelogs/unreleased/sh-update-hamlit-for-gc.yml @@ -0,0 +1,5 @@ +--- +title: Update hamlit to v2.14.2 +merge_request: 52177 +author: +type: fixed diff --git a/ee/spec/features/projects/new_project_spec.rb b/ee/spec/features/projects/new_project_spec.rb index b30f6e1c4b7fbb18b5e571e5ff28b12d07cb9591..3df82832b154a387defebb1f380542907907b670 100644 --- a/ee/spec/features/projects/new_project_spec.rb +++ b/ee/spec/features/projects/new_project_spec.rb @@ -214,7 +214,7 @@ def visit_create_from_group_template_tab it 'the tab shows the list of templates available' do page.within('#custom-group-project-templates') do # Show templates in case they're collapsed - page.all(:xpath, "//div[@class='js-template-group-options template-group-options']", wait: false).each(&:click) + page.find_all('div', class: ['js-template-group-options', 'template-group-options', '!expanded'], wait: false).each(&:click) expect(page).to have_selector('.template-option', count: template_number) end