godmin 0.12.0 → 0.12.1

data/test/integration/filter_overriding_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class ColumnOverridingTest < ActionDispatch::IntegrationTest
+  def test_default_filter
+    visit articles_path
+    assert find("#filters").has_content? "Title"
+  end
+
+  def test_override_filter
+    add_template "app/views/articles/filters/_title.html.erb", "foo"
+    visit articles_path
+    assert find("#filters").has_content? "foo"
+  end
+
+  def test_override_resource_filter
+    add_template "app/views/resource/filters/_title.html.erb", "foo"
+    visit articles_path
+    assert find("#filters").has_content? "foo"
+  end
+
+  def test_override_filter_and_resource_filter
+    add_template "app/views/articles/filters/_title.html.erb", "foo"
+    add_template "app/views/resource/filters/_title.html.erb", "bar"
+    visit articles_path
+    assert find("#filters").has_content? "foo"
+  end
+
+  def test_default_filter_in_engine
+    visit admin.articles_path
+    assert find("#filters").has_content? "Title"
+  end
+
+  def test_override_filter_in_engine
+    add_template "admin/app/views/admin/articles/filters/_title.html.erb", "foo"
+    visit admin.articles_path
+    assert find("#filters").has_content? "foo"
+  end
+
+  def test_override_resource_filter_in_engine
+    add_template "admin/app/views/admin/resource/filters/_title.html.erb", "foo"
+    visit admin.articles_path
+    assert find("#filters").has_content? "foo"
+  end
+
+  def test_override_filter_and_resource_filter_in_engine
+    add_template "admin/app/views/admin/articles/filters/_title.html.erb", "foo"
+    add_template "admin/app/views/admin/resource/filters/_title.html.erb", "bar"
+    visit admin.articles_path
+    assert find("#filters").has_content? "foo"
+  end
+end

data/test/integration/partial_overriding_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class PartialOverridingTest < ActionDispatch::IntegrationTest
+  def test_default_partial
+    visit new_article_path
+    assert page.has_content? "Title"
+  end
+
+  def test_override_partial
+    add_template "app/views/articles/_form.html.erb", "foo"
+    visit new_article_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_resource_partial
+    add_template "app/views/resource/_form.html.erb", "foo"
+    visit new_article_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_partial_and_resource_partial
+    add_template "app/views/articles/_form.html.erb", "foo"
+    add_template "app/views/resource/_form.html.erb", "bar"
+    visit new_article_path
+    assert page.has_content? "foo"
+  end
+
+  def test_default_partial_in_engine
+    visit admin.new_article_path
+    assert page.has_content? "Title"
+  end
+
+  def test_override_partial_in_engine
+    add_template "admin/app/views/admin/articles/_form.html.erb", "foo"
+    visit admin.new_article_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_resource_partial_in_engine
+    add_template "admin/app/views/admin/resource/_form.html.erb", "foo"
+    visit admin.new_article_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_partial_and_resource_partial_in_engine
+    add_template "admin/app/views/admin/articles/_form.html.erb", "foo"
+    add_template "admin/app/views/admin/resource/_form.html.erb", "bar"
+    visit admin.new_article_path
+    assert page.has_content? "foo"
+  end
+end

data/test/integration/template_overriding_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class TemplateOverridingTest < ActionDispatch::IntegrationTest
+  def test_default_template
+    visit articles_path
+    assert page.has_content? "Create Article"
+  end
+
+  def test_override_template
+    add_template "app/views/articles/index.html.erb", "foo"
+    visit articles_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_resource_template
+    add_template "app/views/resource/index.html.erb", "foo"
+    visit articles_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_template_and_resource_template
+    add_template "app/views/articles/index.html.erb", "foo"
+    add_template "app/views/resource/index.html.erb", "bar"
+    visit articles_path
+    assert page.has_content? "foo"
+  end
+
+  def test_default_template_in_engine
+    visit admin.articles_path
+    assert page.has_content? "Create Article"
+  end
+
+  def test_override_template_in_engine
+    add_template "admin/app/views/admin/articles/index.html.erb", "foo"
+    visit admin.articles_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_resource_template_in_engine
+    add_template "admin/app/views/admin/resource/index.html.erb", "foo"
+    visit admin.articles_path
+    assert page.has_content? "foo"
+  end
+
+  def test_override_template_and_resource_template_in_engine
+    add_template "admin/app/views/admin/articles/index.html.erb", "foo"
+    add_template "admin/app/views/admin/resource/index.html.erb", "bar"
+    visit admin.articles_path
+    assert page.has_content? "foo"
+  end
+end

data/test/integration/welcome_test.rb

@@ -0,0 +1,8 @@
+require "test_helper"
+
+class WelcomeTest < ActionDispatch::IntegrationTest
+  def test_welcome
+    visit "/"
+    assert page.has_content? "Welcome"
+  end
+end

data/test/lib/godmin/engine_wrapper_test.rb

@@ -0,0 +1,55 @@
+require "test_helper"
+
+module Godmin
+  class EngineWrapperTest < ActiveSupport::TestCase
+    module Admin
+      class Engine < Rails::Engine
+        isolate_namespace Admin
+      end
+
+      class Controller < ActionController::Base; end
+    end
+
+    class Controller < ActionController::Base; end
+
+    def test_default_namespace
+      engine_wrapper = EngineWrapper.new(Controller)
+      assert_equal nil, engine_wrapper.namespace
+    end
+
+    def test_default_namespaced?
+      engine_wrapper = EngineWrapper.new(Controller)
+      assert_equal false, engine_wrapper.namespaced?
+    end
+
+    def test_default_namespaced_path
+      engine_wrapper = EngineWrapper.new(Controller)
+      assert_equal [], engine_wrapper.namespaced_path
+    end
+
+    def test_default_root
+      engine_wrapper = EngineWrapper.new(Controller)
+      assert_equal Rails.application.root, engine_wrapper.root
+    end
+
+    def test_engine_namespace
+      engine_wrapper = EngineWrapper.new(Admin::Controller)
+      assert_equal Admin, engine_wrapper.namespace
+    end
+
+    def test_engine_namespaced?
+      engine_wrapper = EngineWrapper.new(Admin::Controller)
+      assert_equal true, engine_wrapper.namespaced?
+    end
+
+    def test_engine_namespaced_path
+      engine_wrapper = EngineWrapper.new(Admin::Controller)
+      assert_equal ["godmin", "engine_wrapper_test", "admin"], engine_wrapper.namespaced_path
+    end
+
+    def test_engine_root
+      engine_wrapper = EngineWrapper.new(Admin::Controller)
+      assert_equal Admin::Engine.root, engine_wrapper.root
+    end
+  end
+end

data/test/lib/godmin/policy_finder_test.rb

@@ -1,58 +1,54 @@
 require "test_helper"
 
-module Namespace
-  class ArticlePolicyTestPolicy; end
-  class ObjectPolicy; end
-end
-
-class ArticlePolicyTest; extend ActiveModel::Naming; end
-class OverriddenPolicyTest
-  extend ActiveModel::Naming
-  def self.policy_class
-    Namespace::ObjectPolicy
-  end
-
-  def policy_class
-    Namespace::ObjectPolicy
-  end
-end
-
 module Godmin
   module Authorization
     class PolicyFinderTest < ActiveSupport::TestCase
+      class Article; end
+      class ArticlePolicy; end
+
       def test_find_by_model
-        namespaced_as "namespace" do
-          policy = PolicyFinder.find(ArticlePolicyTest)
-          assert_equal Namespace::ArticlePolicyTestPolicy, policy
+        klass = Class.new do
+          extend ActiveModel::Naming
+
+          def self.name
+            "Article"
+          end
         end
+
+        policy = PolicyFinder.find(klass, Godmin::Authorization::PolicyFinderTest)
+        assert_equal ArticlePolicy, policy
       end
 
       def test_find_by_class
-        namespaced_as "namespace" do
-          policy = PolicyFinder.find(Object)
-          assert_equal Namespace::ObjectPolicy, policy
-        end
+        policy = PolicyFinder.find(Article)
+        assert_equal ArticlePolicy, policy
       end
 
       def test_find_by_symbol
-        namespaced_as "namespace" do
-          policy = PolicyFinder.find(:article_policy_test)
-          assert_equal Namespace::ArticlePolicyTestPolicy, policy
-        end
+        policy = PolicyFinder.find(:article, Godmin::Authorization::PolicyFinderTest)
+        assert_equal ArticlePolicy, policy
       end
 
       def test_override_policy_class_on_class
-        namespaced_as "namespace" do
-          policy = PolicyFinder.find(OverriddenPolicyTest)
-          assert_equal Namespace::ObjectPolicy, policy
+        klass = Class.new do
+          def self.policy_class
+            ArticlePolicy
+          end
         end
+
+        policy = PolicyFinder.find(klass)
+        assert_equal ArticlePolicy, policy
       end
 
       def test_override_policy_class_on_instance
-        namespaced_as "namespace" do
-          policy = PolicyFinder.find(OverriddenPolicyTest.new)
-          assert_equal Namespace::ObjectPolicy, policy
+        klass = Class.new do
+          def policy_class
+            ArticlePolicy
+          end
         end
+
+        policy = PolicyFinder.find(klass.new)
+        assert_equal ArticlePolicy, policy
       end
     end
   end

data/test/lib/godmin/resolver_test.rb

@@ -2,49 +2,39 @@ require "test_helper"
 
 module Godmin
   class ResolverTest < ActiveSupport::TestCase
-    def test_engine_resolver_template_paths
-      namespaced_as "namespace" do
-        assert_equal [
-          "namespace/controller_name/prefix",
-          "namespace/controller_name",
-          "namespace/prefix",
-          "namespace/resource/prefix",
-          "namespace/resource",
-          "namespace"
-        ], EngineResolver.new("controller_name").template_paths("prefix", false)
+    module Admin
+      class Engine < Rails::Engine
+        isolate_namespace Admin
       end
+
+      class Controller < ActionController::Base; end
     end
 
-    def test_engine_resolver_template_paths_when_namespace_is_in_prefix
-      namespaced_as "namespace" do
-        assert_equal [
-          "namespace/controller_name/prefix",
-          "namespace/controller_name",
-          "namespace/prefix",
-          "namespace/resource/prefix",
-          "namespace/resource",
-          "namespace"
-        ], EngineResolver.new("controller_name").template_paths("namespace/prefix", false)
-      end
+    class Controller < ActionController::Base; end
+
+    def setup
+      @engine_wrapper_1 = EngineWrapper.new(Controller)
+      @engine_wrapper_2 = EngineWrapper.new(Admin::Controller)
     end
 
-    def test_engine_resolver_template_paths_when_prefix_contains_godmin
-      namespaced_as "namespace" do
-        assert_equal [], EngineResolver.new("controller_name").template_paths("godmin/namespace/prefix", false)
-      end
+    def test_godmin_resolver_when_not_namespaced
+      resolver = Resolver.new("articles", @engine_wrapper_1)
+
+      assert_equal [
+        File.join(@engine_wrapper_1.root, "app/views/resource"),
+        File.join(Godmin::Engine.root, "app/views/godmin/resource"),
+        File.join(Godmin::Engine.root, "app/views/godmin/articles")
+      ], resolver.template_paths("articles")
     end
 
-    def test_godmin_resolver_template_paths
-      namespaced_as "namespace" do
-        assert_equal [
-          "godmin/controller_name/prefix",
-          "godmin/controller_name",
-          "godmin/prefix",
-          "godmin/resource/prefix",
-          "godmin/resource",
-          "godmin"
-        ], GodminResolver.new("controller_name").template_paths("prefix", false)
-      end
+    def test_godmin_resolver_when_namespaced
+      resolver = Resolver.new("godmin/resolver_test/admin/articles", @engine_wrapper_2)
+
+      assert_equal [
+        File.join(@engine_wrapper_2.root, "app/views/godmin/resolver_test/admin/resource"),
+        File.join(Godmin::Engine.root, "app/views/godmin/resource"),
+        File.join(Godmin::Engine.root, "app/views/godmin/articles")
+      ], resolver.template_paths("godmin/resolver_test/admin/articles")
     end
   end
 end

data/test/lib/godmin/resources/resource_service/batch_actions_test.rb

@@ -4,7 +4,7 @@ module Godmin
   module ResourceService
     class BatchActionsTest < ActiveSupport::TestCase
       def setup
-        @article_service = ArticleService.new
+        @article_service = Fakes::ArticleService.new
       end
 
       def test_batch_action

data/test/lib/godmin/resources/resource_service/filters_test.rb

@@ -4,7 +4,7 @@ module Godmin
   module ResourceService
     class FiltersTest < ActiveSupport::TestCase
       def setup
-        @article_service = ArticleService.new
+        @article_service = Fakes::ArticleService.new
       end
 
       def test_calls_one_filter

data/test/lib/godmin/resources/resource_service/pagination_test.rb

@@ -4,7 +4,7 @@ module Godmin
   module ResourceService
     class PaginationTest < ActiveSupport::TestCase
       def setup
-        @article_service = ArticleService.new
+        @article_service = Fakes::ArticleService.new
 
         resources_class = Class.new do
           def limit(_limit_param)

data/test/lib/godmin/resources/resource_service/scopes_test.rb

@@ -3,17 +3,17 @@ require "test_helper"
 module Godmin
   module ResourceService
     class ScopesTest < ActiveSupport::TestCase
-      class NoScopesService
-        include Godmin::Resources::ResourceService
-      end
-
       def setup
-        @article_service = ArticleService.new
+        @article_service = Fakes::ArticleService.new
       end
 
       def test_returns_resources_when_no_scopes_are_defined
-        @foo_thing = NoScopesService.new
-        assert_equal :resources, @foo_thing.apply_scope("", :resources)
+        service_class = Class.new do
+          include Godmin::Resources::ResourceService
+        end
+
+        service = service_class.new
+        assert_equal :resources, service.apply_scope("", :resources)
       end
 
       def test_calls_default_scope

data/test/lib/godmin/resources/resource_service_test.rb

@@ -3,11 +3,11 @@ require "test_helper"
 module Godmin
   class ResourceServiceTest < ActiveSupport::TestCase
     def setup
-      @article_service = ArticleService.new
+      @article_service = Fakes::ArticleService.new
     end
 
     def test_resource_class
-      assert_equal Article, @article_service.resource_class
+      assert_equal Fakes::Article, @article_service.resource_class
     end
 
     def test_attrs_for_index