activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/spec/javascripts/support/jasmine_runner.rb

@@ -1,32 +1,19 @@
 $:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
 
-require 'rubygems'
 require 'jasmine'
-jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-if Jasmine::rspec2?
-  require 'rspec'
-else
-  require 'spec'
-end
+require 'spec'
 
 jasmine_config = Jasmine::Config.new
 spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-if Jasmine::rspec2?
-  RSpec.configuration.after(:suite) do
+Spec::Runner.configure do |config|
+  config.after(:suite) do
     spec_builder.stop if should_stop
   end
-else
-  Spec::Runner.configure do |config|
-    config.after(:suite) do
-      spec_builder.stop if should_stop
-    end
-  end
 end
 
 spec_builder.start
 should_stop = true
-spec_builder.declare_suites
+spec_builder.declare_suites

data/spec/rails_helper.rb

@@ -1,103 +1,15 @@
 require 'spec_helper'
 
-module ActiveAdminIntegrationSpecHelper
-  extend self
-
-  def load_defaults!
-    ActiveAdmin.unload!
-    ActiveAdmin.load!
-    ActiveAdmin.register(Category)
-    ActiveAdmin.register(User)
-    ActiveAdmin.register(Post){ belongs_to :user, optional: true }
-    reload_menus!
-  end
-
-  def reload_menus!
-    ActiveAdmin.application.namespaces.each{|n| n.reset_menu! }
-  end
-
-  # Sometimes we need to reload the routes within
-  # the application to test them out
-  def reload_routes!
-    Rails.application.reload_routes!
-  end
-
-  # Helper method to load resources and ensure that Active Admin is
-  # setup with the new configurations.
-  #
-  # Eg:
-  #   load_resources do
-  #     ActiveAdmin.regiser(Post)
-  #   end
-  #
-  def load_resources
-    ActiveAdmin.unload!
-    yield
-    reload_menus!
-    reload_routes!
-  end
-
-  # Sets up a describe block where you can render controller
-  # actions. Uses the Admin::PostsController as the subject
-  # for the describe block
-  def describe_with_render(*args, &block)
-    describe *args do
-      include RSpec::Rails::ControllerExampleGroup
-      render_views
-      # metadata[:behaviour][:describes] = ActiveAdmin.namespaces[:admin].resources['Post'].controller
-      module_eval &block
-    end
-  end
-
-  def arbre(assigns = {}, helpers = mock_action_view, &block)
-    Arbre::Context.new(assigns, helpers, &block)
-  end
-
-  def render_arbre_component(assigns = {}, helpers = mock_action_view, &block)
-    arbre(assigns, helpers, &block).children.first
-  end
-
-  # Setup a describe block which uses capybara and rails integration
-  # test methods.
-  def describe_with_capybara(*args, &block)
-    describe *args do
-      include RSpec::Rails::IntegrationExampleGroup
-      module_eval &block
-    end
-  end
-
-  # Returns a fake action view instance to use with our renderers
-  def mock_action_view(assigns = {})
-    controller = ActionView::TestCase::TestController.new
-    ActionView::Base.send :include, ActionView::Helpers
-    ActionView::Base.send :include, ActiveAdmin::ViewHelpers
-    ActionView::Base.send :include, Rails.application.routes.url_helpers
-    ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
-  end
-  alias_method :action_view, :mock_action_view
-
-  # A mock resource to register
-  class MockResource
-  end
-
-  def with_translation(translation)
-    I18n.backend.store_translations :en, translation
-    yield
-  ensure
-    I18n.backend.reload!
-  end
-
-end
-
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
+
+require 'rails'
+ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{Rails.version}", __FILE__)
 
 # Create the test app if it doesn't exists
 unless File.exists?(ENV['RAILS_ROOT'])
   system 'rake setup'
 end
 
-require 'rails'
 require 'active_record'
 require 'active_admin'
 require 'devise'
@@ -111,37 +23,36 @@ require 'rspec/rails'
 # JRuby
 Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
 
-# Setup Some Admin stuff for us to play with
-include ActiveAdminIntegrationSpecHelper
-load_defaults!
-reload_routes!
-
 # Disabling authentication in specs so that we don't have to worry about
 # it allover the place
 ActiveAdmin.application.authentication_method = false
 ActiveAdmin.application.current_user_method = false
 
-# Don't add asset cache timestamps. Makes it easy to integration
-# test for the presence of an asset file
-ENV["RAILS_ASSET_ID"] = ''
-
 RSpec.configure do |config|
+  config.disable_monkey_patching!
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures = false
-  config.include Devise::TestHelpers, type: :controller
   config.render_views = false
   config.filter_run focus: true
   config.filter_run_excluding skip: true
   config.run_all_when_everything_filtered = true
   config.color = true
-end
+  config.order = :random
 
-# All RSpec configuration needs to happen before any examples
-# or else it whines.
-require "support/active_admin_request_helpers"
-RSpec.configure do |c|
-  c.include ActiveAdminRequestHelpers, type: :request
-  c.include Devise::TestHelpers, type: :controller
+  devise = ActiveAdmin::Dependency.devise >= '4.2' ? Devise::Test::ControllerHelpers : Devise::TestHelpers
+  config.include devise, type: :controller
+
+  require 'support/active_admin_integration_spec_helper'
+  config.include ActiveAdminIntegrationSpecHelper
+
+  require 'support/active_admin_request_helpers'
+  config.include ActiveAdminRequestHelpers, type: :request
+
+  # Setup Some Admin stuff for us to play with
+  config.before(:suite) do
+    ActiveAdminIntegrationSpecHelper.load_defaults!
+    ActiveAdminIntegrationSpecHelper.reload_routes!
+  end
 end
 
 # Force deprecations to raise an exception.
@@ -154,7 +65,7 @@ end
 
 # improve the performance of the specs suite by not logging anything
 # see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
-Rails.logger.level = 4
+Rails.logger.level = Logger::FATAL
 
 # Improves performance by forcing the garbage collector to run less often.
 unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'

data/spec/requests/default_namespace_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Application, :type => :request do
+RSpec.describe ActiveAdmin::Application, type: :request do
 
   include Rails.application.routes.url_helpers
 
@@ -8,17 +8,11 @@ describe ActiveAdmin::Application, :type => :request do
 
     describe "with a #{value} default namespace" do
 
-      before(:all) do
-        @__original_application = ActiveAdmin.application
+      around(:all) do |example|
         application = ActiveAdmin::Application.new
         application.default_namespace = value
-        ActiveAdmin.application = application
-        load_defaults!
-        reload_routes!
-      end
 
-      after(:all) do
-        ActiveAdmin.application = @__original_application
+        with_temp_application(application) { example.call }
       end
 
       it "should generate a log out path" do
@@ -33,29 +27,23 @@ describe ActiveAdmin::Application, :type => :request do
 
   end
 
-    describe "with a test default namespace" do
+  describe "with a test default namespace" do
 
-      before(:all) do
-        @__original_application = ActiveAdmin.application
-        application = ActiveAdmin::Application.new
-        application.default_namespace = :test
-        ActiveAdmin.application = application
-        load_defaults!
-        reload_routes!
-      end
+    around(:all) do |example|
+      application = ActiveAdmin::Application.new
+      application.default_namespace = :test
 
-      after(:all) do
-        ActiveAdmin.application = @__original_application
-      end
-
-      it "should generate a log out path" do
-        expect(destroy_admin_user_session_path).to eq "/test/logout"
-      end
+      with_temp_application(application) { example.call }
+    end
 
-      it "should generate a log in path" do
-        expect(new_admin_user_session_path).to eq "/test/login"
-      end
+    it "should generate a log out path" do
+      expect(destroy_admin_user_session_path).to eq "/test/logout"
+    end
 
+    it "should generate a log in path" do
+      expect(new_admin_user_session_path).to eq "/test/login"
     end
 
+  end
+
 end

data/spec/requests/javascript_spec.rb

@@ -7,7 +7,7 @@ require 'rbconfig'
 RbConfig::CONFIG['host_os'].include?('darwin') ? `/usr/libexec/java_home` : `which java`
 java_installed = $?.success?
 
-describe 'Javascript', type: :request, if: java_installed do
+RSpec.describe 'Javascript', type: :request, if: java_installed do
   let(:lint) {
     JSLint::Lint.new \
       paths:         ['public/javascripts/**/*.js'],

data/spec/requests/memory_spec.rb

@@ -1,6 +1,10 @@
 require 'rails_helper'
 
-describe "Memory Leak", type: :request, if: RUBY_ENGINE == 'ruby' do
+RSpec.describe "Memory Leak", type: :request, if: RUBY_ENGINE == 'ruby' do
+  before do
+    load_defaults!
+  end
+
   def count_instances_of(klass)
     ObjectSpace.each_object(klass) { }
   end

data/spec/requests/stylesheets_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "Stylesheets", :type => :request do
+RSpec.describe "Stylesheets", type: :request do
 
   require "sprockets"
 

data/spec/spec_helper.rb

@@ -1,13 +1,3 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH << File.expand_path('../support', __FILE__)
-
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-require "bundler"
-Bundler.setup
-
-require 'detect_rails_version'
-ENV['RAILS'] = detect_rails_version
-
 require 'simplecov'
 
 SimpleCov.start do
@@ -15,3 +5,8 @@ SimpleCov.start do
   add_filter 'features/'
   add_filter 'bundle/' # for Travis
 end
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end

data/spec/support/active_admin_integration_spec_helper.rb

@@ -0,0 +1,66 @@
+module ActiveAdminIntegrationSpecHelper
+  extend self
+
+  def load_defaults!
+    ActiveAdmin.unload!
+    ActiveAdmin.load!
+    ActiveAdmin.register(Category)
+    ActiveAdmin.register(User)
+    ActiveAdmin.register(Post){ belongs_to :user, optional: true }
+    reload_menus!
+  end
+
+  def reload_menus!
+    ActiveAdmin.application.namespaces.each{|n| n.reset_menu! }
+  end
+
+  # Sometimes we need to reload the routes within
+  # the application to test them out
+  def reload_routes!
+    Rails.application.reload_routes!
+  end
+
+  # Helper method to load resources and ensure that Active Admin is
+  # setup with the new configurations.
+  #
+  # Eg:
+  #   load_resources do
+  #     ActiveAdmin.register(Post)
+  #   end
+  #
+  def load_resources
+    ActiveAdmin.unload!
+    yield
+    reload_menus!
+    reload_routes!
+  end
+
+  def arbre(assigns = {}, helpers = mock_action_view, &block)
+    Arbre::Context.new(assigns, helpers, &block)
+  end
+
+  def render_arbre_component(assigns = {}, helpers = mock_action_view, &block)
+    arbre(assigns, helpers, &block).children.first
+  end
+
+  # Returns a fake action view instance to use with our renderers
+  def mock_action_view(assigns = {})
+    controller = ActionView::TestCase::TestController.new
+    MockActionView.new(ActionController::Base.view_paths, assigns, controller)
+  end
+  alias_method :action_view, :mock_action_view
+
+  # A mock action view to test view helpers
+  class MockActionView < ::ActionView::Base
+    include ActionView::Helpers
+    include ActiveAdmin::ViewHelpers
+    include Rails.application.routes.url_helpers
+  end
+
+  def with_translation(translation)
+    I18n.backend.store_translations :en, translation
+    yield
+  ensure
+    I18n.backend.reload!
+  end
+end

data/spec/support/active_admin_request_helpers.rb

@@ -24,4 +24,16 @@ module ActiveAdminRequestHelpers
       @router = ::Rails.application.routes
     end
   end
+
+  def with_temp_application(application)
+    original_application = ActiveAdmin.application
+    ActiveAdmin.application = application
+    load_defaults!
+    reload_routes!
+
+    yield
+
+  ensure
+    ActiveAdmin.application = original_application
+  end
 end

data/spec/support/rails_template.rb

@@ -1,6 +1,10 @@
 # Rails template to build the sample app for specs
 
-generate :model, 'post title:string body:text published_at:datetime author_id:integer ' +
+if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+  copy_file File.expand_path('../templates/manifest.js', __FILE__), 'app/assets/config/manifest.js', force: true
+end
+
+generate :model, 'post title:string body:text published_date:date author_id:integer ' +
   'position:integer custom_category_id:integer starred:boolean foo_id:integer'
 create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
   class Post < ActiveRecord::Base
@@ -10,14 +14,26 @@ create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
     accepts_nested_attributes_for :author
     accepts_nested_attributes_for :taggings
 
+    ransacker :custom_title_searcher do |parent|
+      parent.table[:title]
+    end
+
+    ransacker :custom_created_at_searcher do |parent|
+      parent.table[:created_at]
+    end
+
+    ransacker :custom_searcher_numeric, type: :numeric do
+      # nothing to see here
+    end
+
     unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
-      attr_accessible :id, :title, :body, :starred, :author, :position, :published_at, :author_id, :custom_category_id
+      attr_accessible :id, :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
     end
   end
 RUBY
 copy_file File.expand_path('../templates/post_decorator.rb', __FILE__), 'app/models/post_decorator.rb'
 
-generate :model, 'blog/post title:string body:text published_at:datetime author_id:integer ' +
+generate :model, 'blog/post title:string body:text published_date:date author_id:integer ' +
   'position:integer custom_category_id:integer starred:boolean foo_id:integer'
 create_file 'app/models/blog/post.rb', <<-RUBY.strip_heredoc, force: true
   class Blog::Post < ActiveRecord::Base
@@ -28,7 +44,7 @@ create_file 'app/models/blog/post.rb', <<-RUBY.strip_heredoc, force: true
     accepts_nested_attributes_for :taggings
 
     unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
-      attr_accessible :title, :body, :starred, :author, :position, :published_at, :author_id, :custom_category_id
+      attr_accessible :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
     end
   end
 RUBY
@@ -42,6 +58,10 @@ create_file 'app/models/user.rb', <<-RUBY.strip_heredoc, force: true
     has_one :profile
     accepts_nested_attributes_for :profile, allow_destroy: true
 
+    ransacker :age_in_five_years, type: :numeric, formatter: proc { |v| v.to_i - 5 } do |parent|
+      parent.table[:age]
+    end
+
     unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
       attr_accessible :first_name, :last_name, :username,  :age
     end
@@ -55,6 +75,10 @@ RUBY
 create_file 'app/models/profile.rb', <<-RUBY.strip_heredoc, force: true
   class Profile < ActiveRecord::Base
     belongs_to :user
+
+    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+      attr_accessible :bio
+    end
   end
 RUBY
 
@@ -68,7 +92,7 @@ create_file 'app/models/category.rb', <<-RUBY.strip_heredoc, force: true
     accepts_nested_attributes_for :posts
 
     unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
-      attr_accessible :name
+      attr_accessible :name, :description
     end
   end
 RUBY
@@ -111,15 +135,21 @@ gsub_file 'config/environments/test.rb', /  config.cache_classes = true/, <<-RUB
   config.action_mailer.default_url_options = {host: 'example.com'}
   config.assets.digest = false
 
+  if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1
+    config.active_record.maintain_test_schema = false
+  end
+
 RUBY
 
-# Add our local Active Admin to the load path
-inject_into_file 'config/environment.rb', <<-RUBY, after: "require File.expand_path('../application', __FILE__)"
+# Add our local Active Admin to the application
+gem 'activeadmin', path: '../..'
+gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
+gem 'devise'
 
-$LOAD_PATH.unshift '#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))}'
-require 'active_admin'
+run 'bundle install'
 
-RUBY
+# Setup Active Admin
+generate 'active_admin:install'
 
 # Force strong parameters to raise exceptions
 inject_into_file 'config/application.rb', <<-RUBY, after: 'class Application < Rails::Application'
@@ -137,10 +167,6 @@ directory File.expand_path('../templates/admin', __FILE__), 'app/admin'
 # Add predefined policies
 directory File.expand_path('../templates/policies', __FILE__), 'app/policies'
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-generate 'active_admin:install'
-
 if ENV['RAILS_ENV'] != 'test'
   inject_into_file 'config/routes.rb', "\n  root to: redirect('admin')", after: /.*routes.draw do/
 end
@@ -151,7 +177,8 @@ remove_file 'public/index.html' if File.exists? 'public/index.html' # remove onc
 # https://github.com/plataformatec/devise/issues/2554
 gsub_file 'config/initializers/devise.rb', /# config.secret_key =/, 'config.secret_key ='
 
-rake 'db:migrate'
+rake "db:drop db:create db:migrate", env: 'development'
+rake "db:drop db:create db:migrate", env: 'test'
 
 if ENV['INSTALL_PARALLEL']
   inject_into_file 'config/database.yml', "<%= ENV['TEST_ENV_NUMBER'] %>", after: 'test.sqlite3'