Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
miks committed Oct 29, 2020
1 parent 093a6a2 commit 2b81f9e
Show file tree
Hide file tree
Showing 45 changed files with 48 additions and 50 deletions.
4 changes: 2 additions & 2 deletions releaf-content/lib/releaf/content/node.rb
Expand Up @@ -218,9 +218,9 @@ def valid_node_content_classes parent_id=nil
scope :active, ->() { where(active: true) }

validates_presence_of :name, :slug, :content_type
validates_uniqueness_of :slug, scope: :parent_id
validates_uniqueness_of :slug, scope: :parent_id, case_sensitive: false
validates_length_of :name, :slug, :content_type, maximum: 255
validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?
validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?, case_sensitive: false
validates_presence_of :parent, if: :parent_id?
validate :validate_parent_node_is_not_self
validate :validate_parent_is_not_descendant
Expand Down
Expand Up @@ -10,7 +10,7 @@ class ActionDialogIncluder
def action; end
end

let(:template){ ConfirmDestroyDialogTestHelper.new }
let(:template){ ConfirmDestroyDialogTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ ActionDialogIncluder.new(template) }

Expand Down
Expand Up @@ -9,7 +9,7 @@ def controller_scope_name; end
def generate_url_releaf_content_nodes_path(args); end
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:node){ Node.new(content_type: "TextPage", slug: "b", id: 2,
parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
let(:object){ node.build_content }
Expand Down
Expand Up @@ -9,7 +9,7 @@ def controller_scope_name; end
def generate_url_releaf_content_nodes_path(args); end
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Node.new(content_type: "TextPage", slug: "b", id: 2,
parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
let(:subject){ described_class.new(:resource, object, template, {}) }
Expand Down
Expand Up @@ -7,7 +7,7 @@ class NodeToolboxBuilderTestHelper < ActionView::Base
include Releaf::ApplicationHelper
end

let(:template){ NodeToolboxBuilderTestHelper.new }
let(:template){ NodeToolboxBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
subject { described_class.new(template) }

let(:node){ Node.new(content_type: "TextPage", slug: "a", id: 99) }
Expand Down
2 changes: 1 addition & 1 deletion releaf-content/spec/lib/releaf/content/node_spec.rb
Expand Up @@ -19,7 +19,7 @@ class PlainNode < ActiveRecord::Base
it { is_expected.to validate_presence_of(:name) }
it { is_expected.to validate_presence_of(:slug) }
it { is_expected.to validate_presence_of(:content_type) }
it { is_expected.to validate_uniqueness_of(:slug).scoped_to(:parent_id) }
it { is_expected.to validate_uniqueness_of(:slug).scoped_to(:parent_id).case_insensitive }
it { is_expected.to validate_length_of(:name).is_at_most(255) }
it { is_expected.to validate_length_of(:slug).is_at_most(255) }
end
Expand Down
2 changes: 1 addition & 1 deletion releaf-core/lib/generators/dummy/install_generator.rb
Expand Up @@ -9,7 +9,7 @@ class InstallGenerator < Releaf::Generators::InstallGenerator

def install_assets
copy_files 'assets', 'app/assets'
append_file 'config/initializers/assets.rb', "Rails.application.config.assets.precompile += %w( controllers/*.css controllers/*.js )\n"
#append_file 'config/initializers/assets.rb', "Rails.application.config.assets.precompile += %w( controllers/*.css controllers/*.js )\n"
end

private
Expand Down
2 changes: 1 addition & 1 deletion releaf-core/spec/builders/releaf/builders/base_spec.rb
Expand Up @@ -12,7 +12,7 @@ class BuilderIncluder
end

let(:subject){ BuilderIncluder.new }
let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

before do
subject.template = template
Expand Down
Expand Up @@ -10,7 +10,7 @@ class CollectionTestHelper < ActionView::Base
end

it "it assigns template collection instance variable to instance 'collection' accessor on initialization" do
template = CollectionTestHelper.new
template = CollectionTestHelper.new(ActionView::LookupContext.new(nil), {}, nil)
template.instance_variable_set("@collection", "x")
subject = CollectionIncluder.new(template)
expect(subject.collection).to eq("x")
Expand Down
Expand Up @@ -19,7 +19,7 @@ def request_forgery_protection_token
end
end

let(:template){ ConfirmDestroyDialogTestHelper.new }
let(:template){ ConfirmDestroyDialogTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new(id: 99, title: "book title") }
let(:subject){ described_class.new(template) }

Expand Down
Expand Up @@ -27,7 +27,7 @@ def description_content; end
def confirm_method; end
end

let(:template){ ConfirmDestroyDialogTestHelper.new }
let(:template){ ConfirmDestroyDialogTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new(id: 99, title: "book title") }
let(:subject){ ConfirmDialogBuilderInheriter.new(template) }

Expand Down
Expand Up @@ -18,7 +18,7 @@ def request_forgery_protection_token
end
end

let(:template){ TranslationsEditBuilderTestHelper.new }
let(:template){ TranslationsEditBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:subject){ described_class.new(template) }
let(:controller){ Releaf::ActionController.new }
let(:resource){ Book.new }
Expand All @@ -38,7 +38,7 @@ def request_forgery_protection_token
end

it "returns section with index url preserver and section blocks" do
expect(subject.section_content).to eq('<form class="new_book" id="new_book" action="xxx" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="yyy" value="xxx" />_index_path__section__blocks_</form>')
expect(subject.section_content).to eq('<form class="new_book" id="new_book" action="xxx" accept-charset="UTF-8" method="post"><input type="hidden" name="yyy" value="xxx" />_index_path__section__blocks_</form>')
end

it "assigns form instance to builder" do
Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ Releaf::Builders::FormBuilder.new(:book, object, template, {}) }

Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ Releaf::Builders::FormBuilder.new(:book, object, template, {}) }

Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ Releaf::Builders::FormBuilder.new(:book, object, template, {}) }

Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ Releaf::Builders::FormBuilder.new(:book, object, template, {}) }

Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ Releaf::Builders::FormBuilder.new(:book, object, template, {}) }

Expand Down
Expand Up @@ -7,7 +7,7 @@ class FormBuilderTestHelper < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Book.new }
let(:subject){ described_class.new(:book, object, template, {}) }
let(:normalized_fields){
Expand Down
Expand Up @@ -10,7 +10,7 @@ def controller
end
end

let(:template){ TranslationsIndexBuilderTestHelper.new }
let(:template){ TranslationsIndexBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:subject){ described_class.new(template) }
let(:collection){ Book.page(1).per_page(2) }

Expand Down
Expand Up @@ -19,7 +19,7 @@ def request_forgery_protection_token
end

subject { described_class.new(template) }
let(:template){ PageHeaderBuilderTestHelper.new }
let(:template){ PageHeaderBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

describe "#output" do
it "returns safely joined items" do
Expand Down
Expand Up @@ -32,7 +32,7 @@ class NewRolesController < Releaf::Permissions::RolesController
end

subject { described_class.new(template) }
let(:template){ PageHeaderBuilderTestHelper.new }
let(:template){ PageHeaderBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

describe "#controller_classes" do
it "returns array of ignorable ancester classes" do
Expand Down
Expand Up @@ -6,7 +6,7 @@ class MenuBuilderTestHelper < ActionView::Base
end

let(:controller){ Releaf::ActionController.new }
let(:template){ MenuBuilderTestHelper.new }
let(:template){ MenuBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:group_item){ Releaf::ControllerGroupDefinition.new(name: "_group_name", items: []) }
let(:controller_item){ Releaf::ControllerDefinition.new(name: "y", controller: "_controller_") }
subject { described_class.new(template) }
Expand Down
Expand Up @@ -8,7 +8,7 @@ class PaginationTestView < ActionView::Base
include FontAwesome::Rails::IconHelper
end

let(:template){ PaginationTestView.new }
let(:template){ PaginationTestView.new(ActionView::LookupContext.new(nil), {}, nil) }

let(:items_per_page) { 3 }
let(:current_page_number) { 1 }
Expand Down
Expand Up @@ -11,7 +11,7 @@ class UnitTestDialogBuilder
end

subject { UnitTestDialogBuilder.new(template) }
let(:template){ DialogTestHelper.new }
let(:template){ DialogTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

describe "#dialog?" do
it "always returns true" do
Expand Down
Expand Up @@ -10,7 +10,7 @@ class ResourceViewTestHelper < ActionView::Base
end

let(:described_class){ ResourceViewIncluder }
let(:template){ ResourceViewTestHelper.new }
let(:template){ ResourceViewTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:subject){ described_class.new(template) }
let(:controller){ Releaf::ActionController.new }
let(:resource){ Book.new }
Expand Down
Expand Up @@ -13,7 +13,7 @@ def title_cell; end
def custom_title(resource); end
end

let(:template){ TableBuilderTestHelper.new }
let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource_class){ Book }
let(:resource){ resource_class.new(id: 77, title: "Life of Brian") }
let(:collection){ Book.all }
Expand Down
Expand Up @@ -7,7 +7,7 @@ class ToolboxBuilderTestHelper < ActionView::Base
end

subject { described_class.new(template) }
let(:template){ ToolboxBuilderTestHelper.new }
let(:template){ ToolboxBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

it "includes Releaf::Builders::Base" do
expect(described_class.ancestors).to include(Releaf::Builders::Base)
Expand Down
2 changes: 1 addition & 1 deletion releaf-core/spec/builders/releaf/builders/toolbox_spec.rb
Expand Up @@ -11,7 +11,7 @@ class UnitTestToolboxBuilder
end

subject { UnitTestToolboxBuilder.new(template) }
let(:template){ ToolboxTestTemplate.new }
let(:template){ ToolboxTestTemplate.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource){ Releaf::Permissions::User.new }

describe "#toolbox" do
Expand Down
2 changes: 1 addition & 1 deletion releaf-core/spec/builders/releaf/builders/view_spec.rb
Expand Up @@ -12,7 +12,7 @@ class ViewTestIncluder
end

subject { ViewTestIncluder.new(template) }
let(:template){ ViewTestHelper.new }
let(:template){ ViewTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

it "includes Releaf::Builders::Base" do
expect(described_class.ancestors).to include(Releaf::Builders::Base)
Expand Down
Expand Up @@ -3,7 +3,7 @@
describe Releaf::Settings::FormBuilder, type: :class do
class FormBuilderTestHelper < ActionView::Base; end
let(:resource){ Releaf::Settings.new }
let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:subject){ described_class.new(:resource, resource, template, {}) }

describe "#field_names" do
Expand Down
Expand Up @@ -2,7 +2,7 @@

describe Releaf::Settings::TableBuilder, type: :class do
class TableBuilderTestHelper < ActionView::Base; end
let(:template){ TableBuilderTestHelper.new }
let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource_class){ Releaf::Settings }
let(:subject){ described_class.new([], resource_class, template, {}) }

Expand Down
Expand Up @@ -3,7 +3,7 @@ class I18nEntry < ActiveRecord::Base
self.table_name = "releaf_i18n_entries"

validates_presence_of :key
validates_uniqueness_of :key
validates_uniqueness_of :key, case_sensitive: true
validates_length_of :key, maximum: 255

has_many :i18n_entry_translation, dependent: :destroy,
Expand Down
Expand Up @@ -5,7 +5,7 @@ class I18nBuildersCommonInheriter < Releaf::Builders::IndexBuilder
include Releaf::I18nDatabase::Translations::BuildersCommon
end
class TableBuilderTestHelper < ActionView::Base; end
let(:template){ TableBuilderTestHelper.new }
let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:subject){ I18nBuildersCommonInheriter.new(template) }

describe "#action_url" do
Expand Down
Expand Up @@ -4,15 +4,15 @@
class TableBuilderTestHelper < ActionView::Base
def protect_against_forgery?; end
end
let(:template){ TableBuilderTestHelper.new }
let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource_class){ Releaf::I18nDatabase::Translation }
let(:subject){ described_class.new(template) }

describe "#section" do
it "returns section blocks wrapped within edit form" do
allow(subject).to receive(:action_url).with(:update).and_return("update_url")
allow(subject).to receive(:section_blocks).and_return(["a", "b"])
result = '<section><form action="update_url" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" />ab</form></section>'
result = '<section><form action="update_url" accept-charset="UTF-8" method="post">ab</form></section>'
expect(subject.section).to eq(result)
end
end
Expand Down
Expand Up @@ -15,7 +15,7 @@ def controller
end
end
end
let(:template){ IndexBuilderTestHelper.new }
let(:template){ IndexBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource_class){ Releaf::I18nDatabase::Translation }
let(:subject){ described_class.new(template) }

Expand Down Expand Up @@ -74,7 +74,7 @@ def controller
describe "#import_form" do
it "returns import form" do
allow(subject).to receive(:url_for).with(action: 'import').and_return("import_url")
result = "<form class=\"import\" enctype=\"multipart/form-data\" action=\"import_url\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"file\" name=\"import_file\" id=\"import_file\" /></form>"
result = "<form class=\"import\" enctype=\"multipart/form-data\" action=\"import_url\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"file\" name=\"import_file\" id=\"import_file\" /></form>"
expect(subject.import_form).to eq(result)
end
end
Expand Down
Expand Up @@ -2,7 +2,7 @@

describe Releaf::I18nDatabase::Translations::TableBuilder, type: :class do
class TableBuilderTestHelper < ActionView::Base; end
let(:template){ TableBuilderTestHelper.new }
let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:resource_class){ Releaf::I18nDatabase::I18nEntry }
let(:subject){ described_class.new([], resource_class, template, {}) }

Expand Down
Expand Up @@ -19,7 +19,7 @@ def request_forgery_protection_token
end

subject { described_class.new(template) }
let(:template){ PageHeaderBuilderTestHelper.new }
let(:template){ PageHeaderBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }

describe "#items" do
it "returns array of home link, profile block and logout form content" do
Expand Down Expand Up @@ -74,7 +74,6 @@ def request_forgery_protection_token
allow(subject).to receive(:sign_out_path).and_return("url_a")
content = %Q[
<form class="sign-out" action="url_a" accept-charset="UTF-8" method="post">
<input name="utf8" type="hidden" value="&#x2713;" />
<input type="hidden" name="_method" value="delete" />
<input type="hidden" name="yyy" value="xxx" />
<button class="button only-icon" type="submit" title="Sign out">
Expand Down
Expand Up @@ -4,7 +4,7 @@
class PermissionsLayoutBuilderView < ActionView::Base; end

let(:controller){ Releaf::RootController.new }
let(:template){ PermissionsLayoutBuilderView.new }
let(:template){ PermissionsLayoutBuilderView.new(ActionView::LookupContext.new(nil), {}, nil) }
subject { described_class.new(template) }

before do
Expand Down
Expand Up @@ -7,7 +7,7 @@ class MenuBuilderTestHelper < ActionView::Base

let(:user){ Releaf::Permissions::User.new }
let(:controller){ Releaf::ActionController.new }
let(:template){ MenuBuilderTestHelper.new }
let(:template){ MenuBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:group_item){ Releaf::ControllerGroupDefinition.new(name: "x", items: []) }
let(:controller_item){ Releaf::ControllerDefinition.new(name: "y", controller: "_controller_") }
subject { described_class.new(template) }
Expand Down
Expand Up @@ -2,7 +2,7 @@

describe Releaf::Permissions::Profile::FormBuilder, type: :class do
class FormBuilderTestHelper < ActionView::Base; end
let(:template){ FormBuilderTestHelper.new }
let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
let(:object){ Releaf::Permissions::User.new }
let(:subject){ described_class.new(:resource, object, template, {}) }

Expand Down

0 comments on commit 2b81f9e

Please sign in to comment.