fix: ensure blank? method is defined where used

pact-foundation · Jul 8, 2022 · b81b5e9 · b81b5e9
1 parent 87966a7
commit b81b5e9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/lib/pact_broker/api/middleware/basic_auth.rb b/lib/pact_broker/api/middleware/basic_auth.rb
@@ -1,11 +1,13 @@
 require "rack"
 require "pact_broker/hash_refinements"
+require "pact_broker/string_refinements"
 
 module PactBroker
   module Api
     module Middleware
       class BasicAuth
         using PactBroker::HashRefinements
+        using PactBroker::StringRefinements
 
         def initialize(app, write_credentials, read_credentials, policy)
           @app = app

diff --git a/lib/pact_broker/index/service.rb b/lib/pact_broker/index/service.rb
@@ -4,13 +4,15 @@
 require "pact_broker/repositories/helpers"
 require "pact_broker/index/page"
 require "pact_broker/verifications/latest_verification_for_consumer_version_tag"
+require "pact_broker/string_refinements"
 
 module PactBroker
   module Index
     class Service
       extend PactBroker::Repositories
       extend PactBroker::Services
       extend PactBroker::Logging
+      using PactBroker::StringRefinements
 
       DEFAULT_PAGE_SIZE = 30
       DEFAULT_PAGE_NUMBER = 1

diff --git a/lib/pact_broker/ui/app.rb b/lib/pact_broker/ui/app.rb
@@ -5,6 +5,7 @@
 require "pact_broker/ui/controllers/can_i_deploy"
 require "pact_broker/ui/controllers/error_test"
 require "pact_broker/ui/controllers/dashboard"
+require "pact_broker/ui/helpers/haml_helpers"
 require "pact_broker/doc/controllers/app"
 
 module PactBroker

diff --git a/lib/pact_broker/ui/helpers/haml_helpers.rb b/lib/pact_broker/ui/helpers/haml_helpers.rb
@@ -0,0 +1,10 @@
+require "haml"
+require "pact_broker/string_refinements"
+
+module Haml::Helpers
+  using PactBroker::StringRefinements
+
+  def blank?(thing)
+    thing.blank?
+  end
+end
diff --git a/lib/pact_broker/ui/views/dashboard/show.haml b/lib/pact_broker/ui/views/dashboard/show.haml
@@ -23,10 +23,9 @@
                 = provider_name
 
 
-    - unless errors.blank?
-      - errors.each do | error |
-        %div.alert.alert-danger
-          = error
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
 
     - if consumer && provider
       %form

diff --git a/lib/pact_broker/ui/views/index/show-with-tags.haml b/lib/pact_broker/ui/views/index/show-with-tags.haml
@@ -2,15 +2,14 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
-    - if index_items.empty? && search.blank?
+    - if index_items.empty? && blank?(search)
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
 
-    - unless errors.blank?
-      - errors.each do | error |
-        %div.alert.alert-danger
-          = error
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
 
     %form{action: "#{base_url}"}
       .field

diff --git a/lib/pact_broker/ui/views/index/show.haml b/lib/pact_broker/ui/views/index/show.haml
@@ -2,7 +2,7 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
-    - if index_items.empty? && search.blank?
+    - if index_items.empty? && blank?(search)
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts