Merge pull request #525 from moneyadviceservice/resolve-autoload-issues

Attempt to resolve the autoloading issues on boot
moneyadviceservice · Sep 17, 2023 · 6d4d1d9 · 6d4d1d9
2 parents b8614fd + c8e20f0
commit 6d4d1d9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: Install matching chromedriver
+        uses: nanasess/setup-chromedriver@v2
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:

diff --git a/Gemfile b/Gemfile
@@ -70,7 +70,6 @@ group :test do
   gem 'shoulda-matchers'
   gem 'site_prism'
   gem 'vcr'
-  gem 'webdrivers'
   gem 'webmock', '~> 2.3.1'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -452,7 +452,7 @@ GEM
     retriable (1.4.1)
     reverse_markdown (0.6.0)
       nokogiri
-    rexml (3.2.5)
+    rexml (3.2.6)
     rollbar (3.4.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -564,10 +564,6 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -654,7 +650,6 @@ DEPENDENCIES
   valid_attribute
   vcr
   web-console (~> 2.0)
-  webdrivers
   webmock (~> 2.3.1)
   whenever
   word-to-markdown!

diff --git a/app/serializers/page_link/latest_links.rb b/app/serializers/page_link/latest_links.rb
@@ -1,8 +1,10 @@
+require Rails.root.join('lib', 'publify', 'api')
+
 module PageLink
   class LatestLinks < PageLink::Base
     def as_json
       Rails.cache.fetch('publify_api_latest_links_3', expires_in: 5.minutes) do
-        Publify::API.latest_links(3).map do |input_blog_post|
+        ::Publify::API.latest_links(3).map do |input_blog_post|
           {
             title: input_blog_post['title'],
             path: input_blog_post['link']

diff --git a/app/views/layouts/comfy/admin/cms/_footer_js.html.haml b/app/views/layouts/comfy/admin/cms/_footer_js.html.haml
@@ -1,3 +1,3 @@
-= javascript_include_tag 'requirejs/require', data: { main: javascript_path('application') }
 = javascript_include_tag 'modernizr/modernizr'
+= javascript_include_tag 'requirejs/require', data: { main: javascript_path('application') }
 = yield :footer_js
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -6,7 +6,7 @@
   config.assets.precompile << /\.(?:png|svg|eot|woff|ttf)$/
 
 # Application Stylesheets
-  config.assets.precompile += %w(comfortable_mexican_sofa/admin/basic.css)
+  config.assets.precompile += %w(comfortable_mexican_sofa/admin/basic.css components-font-awesome/css/font-awesome.css)
 
 # Application JavaScript
   config.assets.precompile += %w(application.js)

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -6,7 +6,6 @@
 require 'aruba/cucumber'
 require 'database_cleaner/cucumber'
 require 'selenium/webdriver'
-require 'webdrivers/chromedriver'
 
 DatabaseCleaner.strategy = :truncation