fix root path and tests
This commit is contained in:
parent
a95c97c7ea
commit
b44c29ff50
@ -11,7 +11,7 @@ module Merged
|
|||||||
raise "#{full} contained #{got.class}, not Array" unless got.class == Array
|
raise "#{full} contained #{got.class}, not Array" unless got.class == Array
|
||||||
got
|
got
|
||||||
end
|
end
|
||||||
loaded_files.sum
|
loaded_files.first + loaded_files.last
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -5,7 +5,7 @@ module Merged
|
|||||||
# and the fact that they persist in ActiveYaml
|
# and the fact that they persist in ActiveYaml
|
||||||
|
|
||||||
class ViewBase < ActiveBase
|
class ViewBase < ActiveBase
|
||||||
set_root_path Merged.data_dir
|
set_root_path Rails.root.join(Merged.data_dir)
|
||||||
include ActiveHash::Associations
|
include ActiveHash::Associations
|
||||||
|
|
||||||
belongs_to :image , class_name: "Merged::Image"
|
belongs_to :image , class_name: "Merged::Image"
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
background: solid_blue
|
background: solid_blue
|
||||||
text_color: white
|
text_color: white
|
||||||
align: left
|
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
|
:section_id: 11
|
||||||
:index: 1
|
:index: 1
|
||||||
:image_id: 35
|
:image_id: 35
|
||||||
|
1
test/dummy/merged/option_definitions.yml
Normal file
1
test/dummy/merged/option_definitions.yml
Normal file
@ -0,0 +1 @@
|
|||||||
|
--- []
|
@ -7,6 +7,7 @@ require 'capybara/rails'
|
|||||||
require 'capybara/minitest'
|
require 'capybara/minitest'
|
||||||
require "devise"
|
require "devise"
|
||||||
require "devise/test/integration_helpers"
|
require "devise/test/integration_helpers"
|
||||||
|
require "merged"
|
||||||
|
|
||||||
Dir[Merged::Engine.root.join("test/helpers/**/*.rb")].each { |f| require f }
|
Dir[Merged::Engine.root.join("test/helpers/**/*.rb")].each { |f| require f }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user