HOMS-523 Update puma and selenium, and steady the specs they run on

Author: kompl

Dockerfile

@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   ruby-dev \
   telnet
 
-RUN npm install -g yarn && yarn set version stable
+RUN npm install -g corepack@latest && corepack enable
 
 ENV NLS_LANG=AMERICAN_RUSSIA.AL32UTF8
 

Gemfile.lock

@@ -365,7 +365,7 @@ GEM
       date
       stringio
     public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.2)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.22)
@@ -453,9 +453,9 @@ GEM
     ruby_parser (3.22.0)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
-    rubyzip (3.2.2)
+    rubyzip (3.4.1)
     securerandom (0.4.1)
-    selenium-webdriver (4.41.0)
+    selenium-webdriver (4.46.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

config/puma.rb

@@ -1 +1,3 @@
+port 3000, '0.0.0.0'
+
 threads 1, 1

hbw/app/models/hbw/camunda/yml_api.rb

@@ -5,11 +5,54 @@ class YMLAPI < ::HBW::Common::YMLAPI
 
       class << self
         def build(path)
-          new(YAML.load_file(path, aliases: true), [])
+          from_file(path)
         end
 
         def for_prosess_keys(path, process_keys)
-          new(YAML.load_file(path, aliases: true), process_keys)
+          from_file(path, process_keys)
+        end
+
+        def with_global(path, global)
+          responses = merge_responses(load_file(global), load_file(path))
+          log_stub("#{path} + global #{global}")
+          new(responses, [])
+        end
+
+        private
+
+        def from_file(path, process_keys = [])
+          log_stub(path + (process_keys.empty? ? '' : " #{process_keys.inspect}"))
+          new(load_file(path), process_keys)
+        end
+
+        def load_file(path)
+          YAML.load_file(path, aliases: true)
+        end
+
+        def log_stub(desc)
+          Rails.logger.info("[camunda-mock] stub <- #{desc}")
+        end
+
+        # Combine two {method => {url => [entry]}} mocks. `overlay` entries come before `base` so
+        # fetch_response's find-by-params returns them first: the test mock wins and the global mock
+        # only fills endpoints or params the test mock does not define.
+        def merge_responses(base, overlay)
+          # Not Array(): Array(Hash) splits it into [key, value] pairs instead of wrapping it.
+          entries = lambda do |mock, method, url|
+            case (found = mock.dig(method, url))
+            when nil   then []
+            when Array then found
+            else            [found]
+            end
+          end
+
+          (base.keys | overlay.keys).to_h do |method|
+            urls = (base[method] || {}).keys | (overlay[method] || {}).keys
+            merged = urls.to_h do |url|
+              [url, entries.call(overlay, method, url) + entries.call(base, method, url)]
+            end
+            [method, merged]
+          end
         end
       end
 

hbw/app/models/hbw/common/yml_api.rb

@@ -43,10 +43,14 @@ def load(response_file_path)
       #     - params: <body-2 or querystring-2>
       #       response: <response-2>
       def fetch_response(method, url, params)
-        responses.fetch(method)
-                 .fetch(url)
-                 .find { |el| el['params'] == Addressable::URI.unescape(params.to_query) }
-                 .fetch('response')
+        query = Addressable::URI.unescape(params.to_query)
+        entry = responses.dig(method, url)&.find { |el| el['params'] == query }
+
+        Rails.logger.info("[camunda-mock] #{entry ? 'HIT ' : 'MISS'} #{method.upcase} #{url} params=#{query.inspect}")
+
+        raise KeyError, "no camunda mock entry for #{method.upcase} #{url} params=#{query.inspect}" if entry.nil?
+
+        entry.fetch('response')
       end
     end
 

run_tests.sh

@@ -30,7 +30,7 @@ echo "sources:
     password: test
 " > config/sources.yml
 
-bundle exec rspec ./spec --format RspecJunitFormatter --out test-reports/out.xml --format progress
+bundle exec rspec ./spec --format RspecJunitFormatter --out test-reports/out.xml --format documentation
 
 rubocop --display-only-failed --format junit --out test-reports/rubocop.xml
 

spec/features/users/delete_user_spec.rb

@@ -3,6 +3,8 @@
     admin = FactoryBot.create(:user, :admin)
     @user = FactoryBot.create(:user, :john)
     signin(admin.email, admin.password)
+    expect(page).not_to have_content 'Sign in'
+    expect(page).to     have_content 'Orders list'
   end
 
   scenario 'we can delete user' do
@@ -11,7 +13,7 @@
     expect(page).to have_content I18n.t('users.edit.title')
 
     click_link(I18n.t('users.show.delete_user'))
-    expect(current_path.should).to   eq('/users')
-    expect(page).to have_no_content  @user.email
+    expect(page).to have_current_path('/users')
+    expect(page).to have_no_content @user.email
   end
 end

spec/features/users/users_spec.rb

@@ -123,7 +123,7 @@
     ]
 
     user_generate_api_token(admin).click
-    expect(user_generate_api_token(admin).text).to eq 'Renew API token'
+    expect(page).to have_link('Renew API token', href: "/users/#{admin.id}/generate_api_token")
     expect(is_button_red?("/users/#{admin.id}/generate_api_token")).to be true
 
     admin.reload

spec/hbw/features/bp_form/translation_spec.rb

@@ -20,7 +20,7 @@
   describe 'with current lang = ru' do
     let(:locale) { :ru }
 
-    scenario 'should be translated to russian' do
+    scenario 'should be translated to russian [Q]' do
       click_and_wait 'ORD-1'
 
       expect(page).to     have_content 'Тестирование переводов'

spec/support/camunda_global_mock.yml

@@ -0,0 +1,10 @@
+get:
+  # The business-process definition list. The widget queries it two ways on every page: bare (the
+  # full list) and filtered by the BP user for the start button (/widget/buttons). An empty list
+  # means "nothing to start", so the widget renders no start button — correct for any test that
+  # does not drive process starting. A test that does provides its own entry, which wins.
+  process-definition:
+    - params: ''
+      response: []
+    - params: 'latestVersion=true&startableBy=demo'
+      response: []