From b44c29ff50bbfc07b04a6064804ac3684eed151d Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Sun, 29 Jan 2023 18:34:51 +0200
Subject: [PATCH] fix root path and tests

---
 app/models/merged/shared_base.rb         | 2 +-
 app/models/merged/view_base.rb           | 2 +-
 test/dummy/merged/cards.yml              | 2 +-
 test/dummy/merged/option_definitions.yml | 1 +
 test/test_helper.rb                      | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 test/dummy/merged/option_definitions.yml

diff --git a/app/models/merged/shared_base.rb b/app/models/merged/shared_base.rb
index 6927a0d..d956cc7 100644
--- a/app/models/merged/shared_base.rb
+++ b/app/models/merged/shared_base.rb
@@ -11,7 +11,7 @@ module Merged
         raise "#{full} contained #{got.class}, not Array" unless got.class == Array
         got
       end
-      loaded_files.sum
+      loaded_files.first + loaded_files.last
     end
   end
 end
diff --git a/app/models/merged/view_base.rb b/app/models/merged/view_base.rb
index b659daa..9f35885 100644
--- a/app/models/merged/view_base.rb
+++ b/app/models/merged/view_base.rb
@@ -5,7 +5,7 @@ module Merged
   # and the fact that they persist in ActiveYaml
 
   class ViewBase < ActiveBase
-    set_root_path Merged.data_dir
+    set_root_path Rails.root.join(Merged.data_dir)
     include ActiveHash::Associations
 
     belongs_to :image , class_name: "Merged::Image"
diff --git a/test/dummy/merged/cards.yml b/test/dummy/merged/cards.yml
index ee535d7..2b39c5a 100644
--- a/test/dummy/merged/cards.yml
+++ b/test/dummy/merged/cards.yml
@@ -9,7 +9,7 @@
     background: solid_blue
     text_color: white
     align: left
-  :updated_at: 2023-01-05 21:33:46.577677395 +02:00
+  :updated_at: 2023-01-29 18:34:15.909539509 +02:00
   :section_id: 11
   :index: 1
   :image_id: 35
diff --git a/test/dummy/merged/option_definitions.yml b/test/dummy/merged/option_definitions.yml
new file mode 100644
index 0000000..dcd024e
--- /dev/null
+++ b/test/dummy/merged/option_definitions.yml
@@ -0,0 +1 @@
+--- []
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3cdb072..940ac81 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,6 +7,7 @@ require 'capybara/rails'
 require 'capybara/minitest'
 require "devise"
 require "devise/test/integration_helpers"
+require "merged"
 
 Dir[Merged::Engine.root.join("test/helpers/**/*.rb")].each { |f| require f }