activeadmin 0.6.0 → 0.6.1

data/spec/javascripts/compiled/jquery.aa.popover-spec.js

@@ -1,6 +1,6 @@
 (function() {
 
-  describe("AA.Popover", function() {
+  describe("ActiveAdmin.Popover", function() {
     var $button, $popover, $wrapper, popover;
     $wrapper = void 0;
     $button = void 0;

data/spec/javascripts/compiled/jquery.aa.table-checkbox-toggler-spec.js

@@ -1,12 +1,12 @@
 (function() {
 
-  describe("AA.TableCheckboxToggler", function() {
+  describe("ActiveAdmin.TableCheckboxToggler", function() {
     beforeEach(function() {
       loadFixtures('table_checkboxes.html');
       this.collection = $("#collection");
       this.toggle_all = this.collection.find(".toggle_all");
       this.checkboxes = this.collection.find(":checkbox").not(this.toggle_all);
-      return new AA.TableCheckboxToggler({}, this.collection);
+      return new ActiveAdmin.TableCheckboxToggler({}, this.collection);
     });
     describe("'selected' class for table row", function() {
       it("should add the class 'selected' to rows when their checkbox is checked ", function() {

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper_without_rails", __FILE__)
+require 'spec_helper_without_rails'
 
 module ActiveAdminIntegrationSpecHelper
   extend self
@@ -37,13 +37,13 @@ module ActiveAdminIntegrationSpecHelper
     reload_routes!
   end
 
-  # Sets up a describe block where you can render controller 
+  # 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  
+      render_views
       # metadata[:behaviour][:describes] = ActiveAdmin.namespaces[:admin].resources['Post'].controller
       module_eval &block
     end
@@ -73,7 +73,7 @@ module ActiveAdminIntegrationSpecHelper
     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  
+  end
   alias_method :action_view, :mock_action_view
 
   # A mock resource to register
@@ -136,11 +136,11 @@ RSpec::Matchers.define :have_tag do |*args|
   match_unless_raises Test::Unit::AssertionFailedError do |response|
     tag = args.shift
     content = args.first.is_a?(Hash) ? nil : args.shift
-    
+
     options = {
       :tag => tag.to_s
     }.merge(args[0] || {})
-    
+
     options[:content] = content if content
 
     begin
@@ -163,3 +163,13 @@ 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
+
+
+# Improves performance by forcing the garbage collector to run less often.
+unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
+  require 'support/deferred_garbage_collection'
+  RSpec.configure do |config|
+    config.before(:all) { DeferredGarbageCollection.start }
+    config.after(:all)  { DeferredGarbageCollection.reconsider }
+  end
+end

data/spec/spec_helper_without_rails.rb

@@ -7,3 +7,5 @@ Bundler.setup
 
 require 'detect_rails_version'
 ENV['RAILS'] = detect_rails_version
+
+require 'coveralls' and Coveralls.wear_merged! if ENV['TRAVIS']

data/spec/support/deferred_garbage_collection.rb

@@ -0,0 +1,19 @@
+class DeferredGarbageCollection
+
+  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 15.0).to_f
+
+  @@last_gc_run = Time.now
+
+  def self.start
+    GC.disable
+  end
+
+  def self.reconsider
+    if Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
+      GC.enable
+      GC.start
+      GC.disable
+      @@last_gc_run = Time.now
+    end
+  end
+end

data/spec/support/jslint.yml

@@ -77,4 +77,4 @@ newstat: false
 # although these will still cause a warning:
 #    element && link;
 #    selected ? 5 : 10;
-statinexp: false
+statinexp: false

data/spec/support/rails_template.rb

@@ -1,42 +1,50 @@
 # Rails template to build the sample app for specs
 
 # Create a cucumber database and environment
-copy_file File.expand_path('../templates/cucumber.rb', __FILE__), "config/environments/cucumber.rb"
+copy_file File.expand_path('../templates/cucumber.rb', __FILE__),                "config/environments/cucumber.rb"
 copy_file File.expand_path('../templates/cucumber_with_reloading.rb', __FILE__), "config/environments/cucumber_with_reloading.rb"
 
 gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
 gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n  database: db/cucumber.sqlite3"
 gsub_file 'config/database.yml', /\z/, "\ncucumber_with_reloading:\n  <<: *test\n  database: db/cucumber.sqlite3"
 
-# Generate some test models
 generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer starred:boolean"
-inject_into_file 'app/models/post.rb', "  belongs_to :author, :class_name => 'User'\n  belongs_to :category\n  accepts_nested_attributes_for :author\n", :after => "class Post < ActiveRecord::Base\n"
-
-# We'll put this basic delegator in app/models in order to simplify auto-loading.
+inject_into_file 'app/models/post.rb', %q{
+  belongs_to :category
+  belongs_to :author, :class_name => 'User'
+  accepts_nested_attributes_for :author
+  attr_accessible :author if Rails::VERSION::STRING >= '3.2'
+}, :after => 'class Post < ActiveRecord::Base'
 copy_file File.expand_path('../templates/post_decorator.rb', __FILE__), "app/models/post_decorator.rb"
 
-# Rails 3.2.3 model generator declare attr_accessible
-inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end" if Rails::VERSION::STRING >= '3.2'
 generate :model, "user type:string first_name:string last_name:string username:string age:integer"
-inject_into_file 'app/models/user.rb', "  has_many :posts, :foreign_key => 'author_id'\n", :after => "class User < ActiveRecord::Base\n"
-generate :model, "publisher --migration=false --parent=User"
+inject_into_file 'app/models/user.rb', %q{
+  has_many :posts, :foreign_key => 'author_id'
+  def display_name
+    "#{first_name} #{last_name}"
+  end
+}, :after => 'class User < ActiveRecord::Base'
+
+generate :model, 'publisher --migration=false --parent=User'
 generate :model, 'category name:string description:text'
-inject_into_file 'app/models/category.rb', "  has_many :posts\n  accepts_nested_attributes_for :posts\n", :after => "class Category < ActiveRecord::Base\n"
+inject_into_file 'app/models/category.rb', %q{
+  has_many :posts
+  accepts_nested_attributes_for :posts
+}, :after => 'class Category < ActiveRecord::Base'
 generate :model, 'store name:string'
 
 # Generate a model with string ids
 generate :model, "tag name:string"
 gsub_file(Dir['db/migrate/*_create_tags.rb'][0], /\:tags\sdo\s.*/, ":tags, :id => false, :primary_key => :id do |t|\n\t\t\tt.string :id\n")
-id_model_setup = <<-EOF
+inject_into_file 'app/models/tag.rb', %q{
   self.primary_key = :id
   before_create :set_id
-  
+
   private
   def set_id
     self.id = 8.times.inject("") { |s,e| s << (i = Kernel.rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr }
   end
-EOF
-inject_into_file 'app/models/tag.rb', id_model_setup, :after => "class Tag < ActiveRecord::Base\n"
+}, :after => 'class Tag < ActiveRecord::Base'
 
 if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 1 #Rails 3.1 Gotcha
   gsub_file 'app/models/tag.rb', /self\.primary_key.*$/, "define_attr_method :primary_key, :id"
@@ -60,18 +68,8 @@ run "rm -r spec"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-# we need this routing path, named "logout_path", for testing
-route <<-EOS
-  devise_scope :user do
-    match '/admin/logout' => 'active_admin/devise/sessions#destroy', :as => :logout
-  end
-EOS
-
 generate :'active_admin:install'
 
-# Setup a root path for devise
-route "root :to => 'admin/dashboard#index'"
-
 rake "db:migrate"
 rake "db:test:prepare"
 run "/usr/bin/env RAILS_ENV=cucumber rake db:migrate"
@@ -88,8 +86,7 @@ setup_parallel_tests_database "cucumber.sqlite3", true
 # Somehow, calling parallel_tests tasks from Rails generator using Thor does not work ...
 # RAILS_ENV variable never makes it to parallel_tests tasks.
 # We need to call these tasks in the after set up hook in order to creates cucumber DBs + run migrations on test & cucumber DBs
-create_file 'lib/tasks/parallel.rake' do
-  <<'RAKE'
+create_file 'lib/tasks/parallel.rake', %q{
 namespace :parallel do
   def run_in_parallel(cmd, options)
     count = "-n #{options[:count]}" if options[:count]
@@ -108,5 +105,10 @@ namespace :parallel do
     run_in_parallel("rake db:schema:load RAILS_ENV=cucumber", args)
   end
 end
-RAKE
+}
+
+# If using Devise after 3.1, this is required for the tests to pass:
+require 'devise/version'
+if Devise::VERSION.to_f >= 3.1
+  inject_into_file 'config/initializers/devise.rb', "\n  config.allow_insecure_token_lookup = true", after: 'Devise.setup do |config|'
 end

data/spec/support/templates/admin/stores.rb

@@ -1 +1,5 @@
-ActiveAdmin.register Store
+ActiveAdmin.register Store do
+
+  index :pagination_total => false
+
+end

data/spec/unit/abstract_view_factory_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'active_admin/abstract_view_factory'
 
 describe ActiveAdmin::AbstractViewFactory do
-  
+
   let(:view_factory){ ActiveAdmin::AbstractViewFactory.new }
   let(:mock_view){ Class.new }
 

data/spec/unit/action_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 describe 'defining new actions from registration blocks' do
 
@@ -13,7 +13,7 @@ describe 'defining new actions from registration blocks' do
     after(:each) do
       controller.clear_member_actions!
     end
-    
+
     context "with a block" do
       let(:action!) do
         ActiveAdmin.register Post do
@@ -22,7 +22,7 @@ describe 'defining new actions from registration blocks' do
           end
         end
       end
-        
+
       it "should create a new public instance method" do
         controller.public_instance_methods.collect(&:to_s).should include("comment")
       end
@@ -35,7 +35,7 @@ describe 'defining new actions from registration blocks' do
     end
 
     context "without a block" do
-      let(:action!) do 
+      let(:action!) do
         ActiveAdmin.register Post do
           member_action :comment
         end
@@ -46,7 +46,7 @@ describe 'defining new actions from registration blocks' do
     end
 
     context "with :title" do
-      let(:action!) do 
+      let(:action!) do
         ActiveAdmin.register Post do
           member_action :comment, :title => "My Awesome Comment"
         end
@@ -86,7 +86,7 @@ describe 'defining new actions from registration blocks' do
       end
     end
     context "without a block" do
-      let(:action!) do 
+      let(:action!) do
         ActiveAdmin.register Post do
           collection_action :comments
         end
@@ -96,7 +96,7 @@ describe 'defining new actions from registration blocks' do
       end
     end
     context "with :title" do
-      let(:action!) do 
+      let(:action!) do
         ActiveAdmin.register Post do
           collection_action :comments, :title => "My Awesome Comments"
         end

data/spec/unit/active_admin_spec.rb

@@ -1,20 +1,6 @@
 require 'spec_helper'
 
 describe ActiveAdmin do
-  describe "#default_namespace" do
-    it "should delegate to ActiveAdmin.application" do
-      ActiveAdmin.application.should_receive(:default_namespace)
-
-      ActiveAdmin.default_namespace
-    end
-
-    it "should be deprecated" do
-      ActiveAdmin::Deprecation.should_receive(:warn)
-
-      ActiveAdmin.default_namespace
-    end
-  end
-
   %w(register register_page unload! load! routes).each do |method|
     it "delegates ##{method} to application" do
       ActiveAdmin.application.should_receive(method)

data/spec/unit/application_spec.rb

@@ -48,13 +48,18 @@ describe ActiveAdmin::Application do
     application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
     application.site_title_image.should == "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
   end
+  
+  it "should store the site's favicon" do
+    application.favicon.should == false
+  end
 
-  it "should have a view factory" do
-    application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
+  it "should set the site's favicon" do
+    application.favicon = "/a/favicon.ico"
+    application.favicon.should == "/a/favicon.ico"
   end
 
-  it "should have deprecated admin notes by default" do
-    application.admin_notes.should be_nil
+  it "should have a view factory" do
+    application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
   end
 
   it "should allow comments by default" do
@@ -80,19 +85,6 @@ describe ActiveAdmin::Application do
     end
   end
 
-  describe "inheritable settings" do
-    it "should set csv_options" do
-      application.csv_options.should == {}
-    end
-
-    context "when deprecated" do
-      it "should set and warn csv_column_separator" do
-        ActiveAdmin::Deprecation.should_receive(:warn)
-        application.csv_column_separator.should == ','
-      end
-    end
-  end
-
   describe "files in load path" do
     it "should load files in the first level directory" do
       application.files.should include(File.expand_path("app/admin/dashboard.rb", Rails.root))
@@ -127,6 +119,13 @@ describe ActiveAdmin::Application do
         end
       }.to raise_error("found")
     end
+
+    it "should not pollute the global app" do
+      application.namespaces.keys.should be_empty
+      application.namespace(:brand_new_ns)
+      application.namespaces.keys.should eq [:brand_new_ns]
+      ActiveAdmin.application.namespaces.keys.should eq [:admin]
+    end
   end
 
   describe "#register_page" do

data/spec/unit/asset_registration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 module MockRegistration
   extend ActiveAdmin::AssetRegistration
@@ -14,30 +14,43 @@ describe ActiveAdmin::AssetRegistration do
   it "should register a stylesheet file" do
     MockRegistration.register_stylesheet "active_admin.css"
     MockRegistration.stylesheets.length.should == 1
-    MockRegistration.stylesheets.first.path.should == "active_admin.css"
+    MockRegistration.stylesheets.keys.first.should == "active_admin.css"
   end
 
   it "should clear all existing stylesheets" do
     MockRegistration.register_stylesheet "active_admin.css"
     MockRegistration.stylesheets.length.should == 1
     MockRegistration.clear_stylesheets!
-    MockRegistration.stylesheets.length.should == 0
+    MockRegistration.stylesheets.should be_empty
   end
-  
+
   it "should allow media option when registering stylesheet" do
     MockRegistration.register_stylesheet "active_admin.css", :media => :print
-    MockRegistration.stylesheets.first.options[:media].should == :print
+    MockRegistration.stylesheets.values.first[:media].should == :print
+  end
+
+  it "shouldn't register a stylesheet twice" do
+    MockRegistration.register_stylesheet "active_admin.css"
+    MockRegistration.register_stylesheet "active_admin.css"
+    MockRegistration.stylesheets.length.should == 1
   end
 
+
   it "should register a javascript file" do
     MockRegistration.register_javascript "active_admin.js"
-    MockRegistration.javascripts.should == ["active_admin.js"]
+    MockRegistration.javascripts.should == ["active_admin.js"].to_set
   end
 
   it "should clear all existing javascripts" do
     MockRegistration.register_javascript "active_admin.js"
-    MockRegistration.javascripts.should == ["active_admin.js"]    
+    MockRegistration.javascripts.should == ["active_admin.js"].to_set
     MockRegistration.clear_javascripts!
-    MockRegistration.javascripts.should == []
+    MockRegistration.javascripts.should be_empty
+  end
+
+  it "shouldn't register a javascript twice" do
+    MockRegistration.register_javascript "active_admin.js"
+    MockRegistration.register_javascript "active_admin.js"
+    MockRegistration.javascripts.length.should == 1
   end
 end

data/spec/unit/authorization/authorization_adapter_spec.rb

@@ -16,7 +16,7 @@ describe ActiveAdmin::AuthorizationAdapter do
 
     it "should return the collection unscoped" do
       collection = stub
-      adapter.scope_collection(collection).should == collection
+      adapter.scope_collection(collection, ActiveAdmin::Auth::READ).should == collection
     end
 
   end
@@ -24,7 +24,7 @@ describe ActiveAdmin::AuthorizationAdapter do
   describe "using #normalized in a subclass" do
 
     let(:auth_class) do
-      Class.new(ActiveAdmin::AuthorizationAdapter) do 
+      Class.new(ActiveAdmin::AuthorizationAdapter) do
 
         def authorized?(action, subject = nil)
           case subject
@@ -40,7 +40,7 @@ describe ActiveAdmin::AuthorizationAdapter do
 
     let(:adapter) { auth_class.new(stub, stub) }
 
-    it "should match agains a class" do
+    it "should match against a class" do
       adapter.authorized?(:read, String).should == true
     end