godmin 1.4.0 → 2.2.1

data/test/dummy/app/controllers/another_admin_sessions_controller.rb

@@ -2,8 +2,6 @@ class AnotherAdminSessionsController < ApplicationController
   include Godmin::Authentication::SessionsController
   include Godmin::Authentication
 
-  skip_before_action :authenticate_admin_user
-
   def admin_user_class
     AnotherAdminUser
   end

data/test/dummy/app/controllers/comments_controller.rb

@@ -0,0 +1,3 @@
+class CommentsController < ApplicationController
+  include Godmin::Resources::ResourceController
+end

data/test/dummy/app/models/article.rb

@@ -1,5 +1,6 @@
 class Article < ActiveRecord::Base
   belongs_to :admin_user
+  has_many :comments
 
   def non_orderable_column
     "Not orderable"

data/test/dummy/app/models/comment.rb

@@ -0,0 +1,7 @@
+class Comment < ActiveRecord::Base
+  belongs_to :article
+
+  def to_s
+    title
+  end
+end

data/test/dummy/app/models/magazine.rb

@@ -0,0 +1,2 @@
+class Magazine < ActiveRecord::Base
+end

data/test/dummy/app/services/article_service.rb

@@ -5,6 +5,8 @@ class ArticleService
   attrs_for_show :id, :title, :body, :admin_user, :published
   attrs_for_form :title, :body, :admin_user, :published
 
+  has_many :comments
+
   def order_by_admin_user(resources, direction)
     resources.joins(:admin_users).order("admin_users.email #{direction}")
   end

data/test/dummy/app/services/comment_service.rb

@@ -0,0 +1,7 @@
+class CommentService
+  include Godmin::Resources::ResourceService
+
+  attrs_for_index :id, :title
+  attrs_for_show :id, :title, :body
+  attrs_for_form :title, :body
+end

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/config/application.rb

@@ -1,23 +1,11 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
-require 'rails/all'
+require "rails/all"
 
 Bundler.require(*Rails.groups)
 require "godmin"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end
-

data/test/dummy/config/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    models:
+      article:
+        one: Article
+        other: Articles
+      comment:
+        one: Comment
+        other: Comments

data/test/dummy/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
-  resources :articles
+  resources :articles do
+    resources :comments
+  end
   resources :authenticated_articles
   resources :authorized_articles
   resource :session, only: [:new, :create, :destroy]

data/test/dummy/db/migrate/20150717121532_create_articles.rb

@@ -1,4 +1,4 @@
-class CreateArticles < ActiveRecord::Migration
+class CreateArticles < ActiveRecord::Migration[5.0]
   def change
     create_table :articles do |t|
       t.string :title

data/test/dummy/db/migrate/20150907133753_create_admin_users.rb

@@ -1,4 +1,4 @@
-class CreateAdminUsers < ActiveRecord::Migration
+class CreateAdminUsers < ActiveRecord::Migration[5.0]
   def change
     create_table :admin_users do |t|
       t.string :email

data/test/dummy/db/migrate/20160713134238_create_comment.rb

@@ -0,0 +1,9 @@
+class CreateComment < ActiveRecord::Migration[5.0]
+  def change
+    create_table :comments do |t|
+      t.references :article, index: true, foreign_key: true
+      t.string :title
+      t.text :body
+    end
+  end
+end

data/test/dummy/db/migrate/20210519215502_create_magazines.rb

@@ -0,0 +1,9 @@
+class CreateMagazines < ActiveRecord::Migration[6.1]
+  def change
+    create_table :magazines do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -2,37 +2,52 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170207081043) do
+ActiveRecord::Schema.define(version: 2021_05_19_215502) do
 
   create_table "admin_users", force: :cascade do |t|
-    t.string   "email"
-    t.text     "password_digest"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.string "email"
+    t.text "password_digest"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "another_admin_users", force: :cascade do |t|
-    t.string   "email"
-    t.text     "password_digest"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.string "email"
+    t.text "password_digest"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "articles", force: :cascade do |t|
-    t.string   "title"
-    t.text     "body"
-    t.boolean  "published",     default: false
-    t.integer  "admin_user_id"
-    t.datetime "created_at",                    null: false
-    t.datetime "updated_at",                    null: false
+    t.string "title"
+    t.text "body"
+    t.boolean "published", default: false
+    t.integer "admin_user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["admin_user_id"], name: "index_articles_on_admin_user_id"
   end
 
+  create_table "comments", force: :cascade do |t|
+    t.integer "article_id"
+    t.string "title"
+    t.text "body"
+    t.index ["article_id"], name: "index_comments_on_article_id"
+  end
+
+  create_table "magazines", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+  add_foreign_key "comments", "articles"
 end

data/test/fakes/article.rb

@@ -5,7 +5,7 @@ module Fakes
     end
 
     def self.column_names
-      ["id", "title"]
+      %w[id title]
     end
   end
 end

data/test/fakes/article_service.rb

@@ -13,8 +13,8 @@ module Fakes
     scope :published
 
     filter :title
-    filter :country, as: :select, collection: %w(Sweden Canada)
-    filter :tags, as: :multiselect, collection: %w(Apple Banana)
+    filter :country, as: :select, collection: %w[Sweden Canada]
+    filter :tags, as: :multiselect, collection: %w[Apple Banana]
 
     batch_action :unpublish
     batch_action :publish, confirm: true, only: [:unpublished], except: [:published]
@@ -24,12 +24,8 @@ module Fakes
       @called_methods = { scopes: {}, filters: {}, batch_actions: {}, ordering: {} }
     end
 
-    def resource_class
-      Fakes::Article
-    end
-
     def resources_relation
-      [:foo, :bar, :baz]
+      %i[foo bar baz]
     end
 
     def order_by_foobar(resources, direction)

data/test/generators/resource_generator_test.rb

@@ -0,0 +1,78 @@
+require "test_helper"
+require "generators/godmin/resource/resource_generator"
+
+module Godmin
+  class ResourceGeneratorTest < ::Rails::Generators::TestCase
+    tests ResourceGenerator
+    destination File.expand_path("../../tmp", __FILE__)
+    setup :prepare_destination
+    teardown :prepare_destination
+
+    def test_resource_generator_in_standalone_install
+      system "cd #{destination_root} && rails new . --skip-test --skip-spring --skip-bundle --skip-git --quiet"
+      system "cd #{destination_root} && bin/rails generate godmin:install --quiet"
+      system "cd #{destination_root} && bin/rails generate godmin:resource foo bar --quiet"
+
+      assert_file "config/routes.rb", /resources :foos/
+      assert_file "app/views/shared/_navigation.html.erb", /<%= navbar_item Foo %>/
+
+      assert_file "app/controllers/foos_controller.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          class FoosController < ApplicationController
+            include Godmin::Resources::ResourceController
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+
+      assert_file "app/services/foo_service.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          class FooService
+            include Godmin::Resources::ResourceService
+
+            attrs_for_index :bar
+            attrs_for_show :bar
+            attrs_for_form :bar
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+    end
+
+    def test_resource_generator_in_engine_install
+      system "cd #{destination_root} && rails new . --skip-test --skip-spring --skip-bundle --skip-git --quiet"
+      system "cd #{destination_root} && bin/rails plugin new fakemin --mountable --quiet"
+      system "cd #{destination_root} && fakemin/bin/rails generate godmin:install --quiet"
+      system "cd #{destination_root} && fakemin/bin/rails generate godmin:resource foo bar --quiet"
+
+      assert_file "fakemin/config/routes.rb", /resources :foos/
+      assert_file "fakemin/app/views/fakemin/shared/_navigation.html.erb", /<%= navbar_item Foo %>/
+
+      assert_file "fakemin/app/controllers/fakemin/foos_controller.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          module Fakemin
+            class FoosController < ApplicationController
+              include Godmin::Resources::ResourceController
+            end
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+
+      assert_file "fakemin/app/services/fakemin/foo_service.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          module Fakemin
+            class FooService
+              include Godmin::Resources::ResourceService
+
+              attrs_for_index :bar
+              attrs_for_show :bar
+              attrs_for_form :bar
+            end
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+    end
+  end
+end

data/test/integration/authentication_test.rb

@@ -17,8 +17,9 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
 
   def test_sign_in_with_non_default_user
     AnotherAdminUser.create!(email: "another_admin@example.com", password: "password")
-    post another_admin_session_path, another_admin_user: { email: "another_admin@example.com", password: "password" }
-
+    post another_admin_session_path, params: {
+      another_admin_user: { email: "another_admin@example.com", password: "password" }
+    }
     assert_redirected_to root_path
   end
 end

data/test/integration/authorization_test.rb

@@ -29,4 +29,17 @@ class AuthorizationTest < ActionDispatch::IntegrationTest
     page.driver.delete authorized_article_path(article)
     assert_equal 403, page.status_code
   end
+
+  def test_cannot_index_in_engine?
+    visit admin.authorized_articles_path
+    assert_equal 403, page.status_code
+  end
+
+  def test_uses_engine_policy_in_engine?
+    visit admin.new_authorized_article_path
+
+    assert_equal 200, page.status_code
+
+    assert page.has_content?("Can't index"), "when used in an engine, the `policy` method is using the policy from the main app, not the engine"
+  end
 end

data/test/integration/nested_resources_test.rb

@@ -0,0 +1,47 @@
+require "test_helper"
+
+class NestedResourcesTest < ActionDispatch::IntegrationTest
+  def test_list_nested_resources
+    article = Article.create! title: "foo", comments: [
+      Comment.new(title: "bar")
+    ]
+
+    visit articles_path
+    within "[data-resource-id='#{article.id}']" do
+      click_link "Show"
+    end
+    click_link "Comments"
+
+    assert_equal article_comments_path(article), current_path
+    assert page.has_content? "bar"
+  end
+
+  def test_list_nested_resources_scoping
+    article = Article.create! title: "foo", comments: [
+      Comment.new(title: "bar")
+    ]
+    Comment.create! title: "baz"
+
+    visit article_comments_path(article)
+
+    assert page.has_content? "bar"
+    assert page.has_no_content? "baz"
+  end
+
+  def test_create_nested_resource
+    article = Article.create! title: "foo"
+
+    visit new_article_comment_path(article)
+
+    fill_in "Title", with: "bar"
+    click_button "Create Comment"
+
+    assert_equal article_comment_path(article, Comment.last), current_path
+
+    within "#breadcrumb" do
+      click_link "Comments"
+    end
+
+    assert page.has_content? "bar"
+  end
+end

data/test/test_helper.rb

@@ -1,11 +1,6 @@
-# TODO: This does not work anymore. We need to update this according to:
-# https://docs.codeclimate.com/docs/ruby
-#
-# require "codeclimate-test-reporter"
-# CodeClimate::TestReporter.start
-
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
+ENV["DISABLE_DATABASE_ENVIRONMENT_CHECK"] = "1"
 
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rails/test_help"
@@ -14,7 +9,6 @@ require "capybara/poltergeist"
 require "minitest/reporters"
 require "pry"
 
-# TODO: what to call these?
 require File.expand_path("../fakes/article.rb", __FILE__)
 require File.expand_path("../fakes/article_service.rb", __FILE__)