Make some specs pass

Gemfile

@@ -11,7 +11,7 @@ end
 
 gemspec
 
-gem "rails", "~> 5.1"
+gem "rails", "~> 8.0"
 
 group :development, :test do
   gem 'bootsnap', require: false
@@ -28,6 +28,7 @@ group :development, :test do
   gem 'puma'
   gem 'paperclip', '~> 5.3'
   gem 'dunlop-ember', gitlab: 'benja-2/dunlop-ember', branch: 'master'
+  gem 'record_collection' #, github: 'bterkuile/record_collection', branch: 'master'
 
   #gem 'carrierwave'
   #gem 'fog-aws'

README.md

@@ -4,6 +4,7 @@ dunlop
 
 Installation
 -----------------------
+test change for git
 ```
 gem 'dunlop-core', github: 'mozolutions/dunlop-core', branch: :master
 gem 'devise'

app/models/dunlop/execution_batch_model.rb

@@ -73,7 +73,7 @@ module Dunlop::ExecutionBatchModel
     def execute
       execute!
     end
-    deprecate execute: "Please use execute! in stead of execute. This will be removed in dunlop v0.2.0"
+    # deprecate execute: "Please use execute! in stead of execute. This will be removed in dunlop v0.2.0"
 
     def cleanup!(older_than = 1.month.ago)
       older_than = older_than.ago if older_than.is_a?(ActiveSupport::Duration)

app/models/dunlop/user_filter.rb

@@ -2,7 +2,7 @@ module Dunlop
   class UserFilter < ApplicationRecord
     belongs_to :user
     if Rails.application.config.database_configuration[Rails.env]['adapter'] != 'postgesql' # postgesql uses jsonb
-      serialize :filters, JSONColumnCoder.new(Hash)
+      serialize :filters, coder: JSONColumnCoder.new(Hash)
     end
 
     before_save do

app/models/dunlop/user_model.rb

@@ -3,9 +3,9 @@ module Dunlop
     extend ActiveSupport::Concern
 
     included do
-      serialize :role_names, JSONColumnCoder.new(Array)
-      serialize :role_names_admin, JSONColumnCoder.new(Array)
-      serialize :settings_storage, JSONColumnCoder.new(Hash)
+      serialize :role_names, coder: JSONColumnCoder.new(Array)
+      serialize :role_names_admin, coder: JSONColumnCoder.new(Array)
+      serialize :settings_storage, coder: JSONColumnCoder.new(Hash)
       has_many :source_files, as: :creator
       has_many :user_filters, class_name: 'Dunlop::UserFilter'
     end

app/services/dunlop/loggable.rb

@@ -6,7 +6,7 @@ module Dunlop::Loggable
   end
 
   def with_nested_logger_and_catch_failed(scope=nil, options={})
-    scope ||= caller[0][/`.*'/][1..-2]
+    scope ||= caller[0][/'.*'/][1..-2]
     options[:exception_notifier] = true unless options.has_key?(:exception_notifier)
     backtrace = nil
     ::Dunlop::NestedLogger.scope('empty sandbox', benchmark: false) do

app/services/dunlop/overdue_handling.rb

@@ -1,4 +1,5 @@
-module Dunlop::OverdueHandling
+module Dunlop
+  module OverdueHandling
     @registry = {}
     @final_states = %w[overdue completed rejected]
 
@@ -122,3 +123,4 @@ module Dunlop::OverdueHandling
       end
     end
   end
+end

bin/rails

@@ -3,6 +3,7 @@
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/dunlop/engine', __FILE__)
+APP_PATH    = File.expand_path("../spec/dummy/config/application", __dir__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

dunlop-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 4.2.6"
   s.add_dependency 'slim-rails'
-  #s.add_dependency 'record_collection', '>= 0.10.4'
+  #s.add_dependency 'record_collection', '>= 0.10.4' # Only in Gemfile to make not requried
   s.add_dependency 'request_store'
   s.add_dependency 'ransack'
   s.add_dependency 'responders'
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'facets'
   s.add_dependency 'memoist'
   s.add_dependency 'cancancan'
+  s.add_dependency 'csv'
 
   # assets
   #s.add_dependency 'momentjs-rails'

lib/dunlop-core.rb

@@ -0,0 +1 @@
+require "dunlop"

lib/dunlop/csv_builder.rb

@@ -45,7 +45,7 @@ module Dunlop::CsvBuilder
     return resource.to_csv if self.class == CsvBuilder and resource.present? and resource.respond_to?(:to_csv) and !resource.is_a?(Array)
 
     # try iteration otherwise
-    str = CSV.generate csv_options do |csv|
+    str = CSV.generate **csv_options do |csv|
       csv << headers if headers.present?
       for_each_serialized_row do |serialized_row|
         csv << serialized_row

lib/dunlop/engine.rb

@@ -2,14 +2,14 @@
 # Asset groups
 if (Rails.groups.map(&:to_s) & %w[development assets test]).any?
   require "sass-rails"
-  require "js-routes"
-  require "momentjs-rails"
+  #require "js-routes"
+  #require "momentjs-rails"
   require 'coffee-rails'
-  require "pickadate-rails"
+  #require "pickadate-rails"
 end
 
 require "slim-rails"
-require 'record_collection'
+#require 'record_collection'
 require 'request_store'
 require 'ransack'
 require 'devise'
@@ -36,13 +36,6 @@ module Dunlop
   class Engine < ::Rails::Engine
     isolate_namespace Dunlop
 
-    #TODO this generates noise and pollutes API based implementations (Like Panda)
-    initializer 'dunlop.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        helper ::Dunlop::ApplicationHelper if respond_to?(:helper)
-      end
-    end
-
     initializer "dunlop.ability", group: 'dunlop' do |app|
       if ability_class = "Ability".safe_constantize and ability_class.respond_to?(:add_dunlop_allowed_authorization_classes!)
         ability_class.add_dunlop_allowed_authorization_classes!
@@ -59,6 +52,7 @@ module Dunlop
     end
 
     config.after_initialize do
+
       # Auto generate target-file's ::Job classes having purpose triggering .generate on the class
       ::Dunlop.target_file_models.each do |target_file_base_model|
         ## Generte a job for all target files

lib/generators/dunlop/install/base/base_generator.rb

@@ -36,8 +36,8 @@ class Dunlop::Install::BaseGenerator < Rails::Generators::Base
     config.application_name = "#{Rails.application.class.name.deconstantize}"
 
     config.git_version = Rails.env
-    config.git_version = File.read('REVISION').strip if File.exists?('REVISION')
-    config.git_version = File.read('OFFLINE_REVISION').strip if File.exists?('OFFLINE_REVISION')
+    config.git_version = File.read('REVISION').strip if File.exist?('REVISION')
+    config.git_version = File.read('OFFLINE_REVISION').strip if File.exist?('OFFLINE_REVISION')
 
     RUBY
     end

spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+  //= link_tree ../images
+  //= link_directory ../javascripts .js
+  //= link_directory ../stylesheets .css

spec/dummy/app/models/owner_initialization.rb

@@ -1,8 +1,8 @@
 class OwnerInitialization < ApplicationRecord
   include WorkflowStepModel
 
-  serialize :window_from, DayTimeMinutes
-  serialize :window_to,   DayTimeMinutes
+  serialize :window_from, coder: DayTimeMinutes
+  serialize :window_to,   coder: DayTimeMinutes
 
   activate_dunlop!
 end

spec/dummy/config/application.rb

@@ -22,8 +22,8 @@ module Dummy
     config.application_name = 'Dunlop'
 
     config.git_version = nil
-    config.git_version = File.read('REVISION').strip if File.exists?('REVISION')
-    config.git_version = File.read('OFFLINE_REVISION').strip if File.exists?('OFFLINE_REVISION')
+    config.git_version = File.read('REVISION').strip if File.exist?('REVISION')
+    config.git_version = File.read('OFFLINE_REVISION').strip if File.exist?('OFFLINE_REVISION')
 
     config.file_storage_path = Rails.root.join('files') # source file storage
     config.working_path = '/tmp' # source file processing directory

spec/dummy/config/initializers/dunlop_overdue_config.rb

@@ -1,3 +1,5 @@
+Rails.application.config.after_initialize do
   Dunlop::OverdueHandling.define do
     when_workflow_step :contractor_initialization, is: 2.days, from: {owner_initialization: :plan_date}
   end
+end

spec/dummy/config/initializers/dunlop_workflow_config.rb

@@ -1,3 +1,5 @@
+Rails.application.config.after_initialize do
   Dunlop::Workflow.configure do |config|
     config.max_number_of_records_in_display_badge = 72
   end
+end

spec/dummy/config/initializers/dunlop_workflow_steps_in_batch_finished_config.rb

@@ -1,3 +1,4 @@
+Rails.application.config.after_initialize do
   Dunlop::WorkflowStepsInBatchFinished.define do
     the_final_states_are %w[rejected completed]
 
@@ -26,3 +27,4 @@ Dunlop::WorkflowStepsInBatchFinished.define do
     #end
 
   end
+end

spec/factories/target_files.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
     original_file { Tempfile.new("target_file_factory") }
     trait :failed do
       after(:build) { |record| record.log_entries.build(body: 'ERROR - some reason to fail') }
-      state 'failed'
+      state { 'failed' }
     end
   end
 

spec/factories/users.rb

@@ -6,14 +6,14 @@ FactoryBot.define do
 
   factory :user do
     email
-    password 'password'
-    role_names %w[read-class-WorkflowInstance]
+    password   { 'password' }
+    role_names { %w[read-class-WorkflowInstance] }
   end
 
   factory :admin, class: User do
-    email 'admin@example.com'
-    password 'password'
-    admin true
+    email    { 'admin@example.com' }
+    password { 'password' }
+    admin    { true }
   end
 end
 

spec/factories/workflow_instance.rb

@@ -1,29 +1,29 @@
 FactoryBot.define do
   factory :workflow_instance do
     after(:build){|instance| instance.setup_workflow_steps }
-    state "unplanned" # default for Vula
+    state  { "unplanned" } # default for Vula
 
     trait :uncategorized do
-        state 'uncategorized'
+        state { 'uncategorized' }
     end
 
     trait :unplanned do
-      state 'unplanned'
+      state { 'unplanned' }
     end
 
     trait :planned do
-      state 'planned'
+      state { 'planned' }
     end
 
     trait :active do
-      state 'active'
+      state { 'active' }
       after :build do |instance|
         instance.workflow_steps.first.state = 'processing'
       end
     end
 
     trait :overdue do
-      state 'overdue'
+      state { 'overdue' }
       after :build do |instance|
         instance.owner_initialization.plan_date = 1.year.ago
         instance.contractor_initialization.state = 'overdue'
@@ -31,14 +31,14 @@ FactoryBot.define do
     end
 
     trait :all_completed do
-      state 'all_completed'
+      state { 'all_completed' }
       after :build do |instance|
         instance.workflow_steps.each{|workflow_step| workflow_step.state = 'completed' }
       end
     end
 
     trait :any_rejected do
-      state 'any_rejected'
+      state { 'any_rejected' }
       after :build do |instance|
         instance.workflow_steps.first.state = 'rejected'
       end

spec/models/execution_batch_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Dunlop::ExecutionBatch do
+describe ::ExecutionBatch do
   let(:time) { '1981-03-09T13:33:04Z'.to_time }
   let(:model) { ExecutionBatch::MyBatch }
   before { Timecop.freeze time }

spec/rails_helper.rb

@@ -43,7 +43,7 @@ RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 1
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Dunlop::Engine.root.join("spec/fixtures")
+  config.fixture_paths = [Dunlop::Engine.root.join("spec/fixtures")]
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
 
 

spec/services/dunlop/file_zip_spec.rb

@@ -20,10 +20,10 @@ RSpec.describe Dunlop::FileZip do
     context "mime-type: application/zip" do
 
       it "unzips the file to the provided filename" do
-        expect(File.exists?(destination_filename)).to be_falsey
+        expect(File.exist?(destination_filename)).to be_falsey
         subject.unzip(zipped_filename, destination_filename)
-        expect(File.exists?(destination_filename)).to be_truthy
-        expect(File.exists?(zipped_filename)).to be_truthy
+        expect(File.exist?(destination_filename)).to be_truthy
+        expect(File.exist?(zipped_filename)).to be_truthy
         expect(File.read(destination_filename)).to eq File.read(unzipped_filename)
       end
 
@@ -34,10 +34,10 @@ RSpec.describe Dunlop::FileZip do
     context "mime-type: application/x-gzip" do
 
       it "unzips the file to the provided filename" do
-        expect(File.exists?(destination_filename)).to be_falsey
+        expect(File.exist?(destination_filename)).to be_falsey
         subject.unzip(gzipped_filename, destination_filename)
-        expect(File.exists?(destination_filename)).to be_truthy
-        expect(File.exists?(gzipped_filename)).to be_truthy
+        expect(File.exist?(destination_filename)).to be_truthy
+        expect(File.exist?(gzipped_filename)).to be_truthy
         expect(File.read(destination_filename)).to eq File.read(unzipped_filename)
       end
 
@@ -46,10 +46,10 @@ RSpec.describe Dunlop::FileZip do
     context "mime-type: text/plain" do
 
       it "copies the file to the provided filename" do
-        expect(File.exists?(destination_filename)).to be_falsey
+        expect(File.exist?(destination_filename)).to be_falsey
         subject.unzip(unzipped_filename, destination_filename)
-        expect(File.exists?(destination_filename)).to be_truthy
-        expect(File.exists?(unzipped_filename)).to be_truthy
+        expect(File.exist?(destination_filename)).to be_truthy
+        expect(File.exist?(unzipped_filename)).to be_truthy
         expect(File.read(destination_filename)).to eq File.read(unzipped_filename)
       end
 
@@ -69,10 +69,10 @@ RSpec.describe Dunlop::FileZip do
     end
 
     it "gzips the file to the provided filename" do
-      expect(File.exists?(gzipped_filename)).to be_falsey
+      expect(File.exist?(gzipped_filename)).to be_falsey
       subject.gzip(unzipped_filename, gzipped_filename)
-      expect(File.exists?(gzipped_filename)).to be_truthy
-      expect(File.exists?(unzipped_filename)).to be_truthy
+      expect(File.exist?(gzipped_filename)).to be_truthy
+      expect(File.exist?(unzipped_filename)).to be_truthy
 
       expect(File.size(unzipped_filename)).to eq 305
       expect(File.size(gzipped_filename)).to eq 153