yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/spec/unit/batch_actions/settings_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Batch Actions Settings" do
   let(:app) { ActiveAdmin::Application.new }
@@ -8,54 +8,54 @@ describe "Batch Actions Settings" do
   it "should be disabled globally by default" do
     # Note: the default initializer would set it to true
 
-    app.batch_actions.should be_false
-    ns.batch_actions.should be_false
-    post_resource.batch_actions_enabled?.should be_false
+    expect(app.batch_actions).to be_falsey
+    expect(ns.batch_actions).to be_falsey
+    expect(post_resource.batch_actions_enabled?).to be_falsey
   end
 
   it "should be settable to true" do
     app.batch_actions = true
-    app.batch_actions.should == true
+    expect(app.batch_actions).to be_truthy
   end
 
   it "should be an inheritable_setting" do
     app.batch_actions = true
-    ns.batch_actions.should == true
+    expect(ns.batch_actions).to be_truthy
   end
 
   it "should be settable at the namespace level" do
     app.batch_actions = true
     ns.batch_actions = false
 
-    app.batch_actions.should == true
-    ns.batch_actions.should == false
+    expect(app.batch_actions).to be_truthy
+    expect(ns.batch_actions).to be_falsey
   end
 
   it "should be settable at the resource level" do
-    post_resource.batch_actions_enabled?.should == false
+    expect(post_resource.batch_actions_enabled?).to be_falsey
     post_resource.batch_actions = true
-    post_resource.batch_actions_enabled?.should == true
+    expect(post_resource.batch_actions_enabled?).to be_truthy
   end
 
   it "should inherit the setting on the resource from the namespace" do
     ns.batch_actions = false
-    post_resource.batch_actions_enabled?.should == false
-    post_resource.batch_actions.should be_empty
+    expect(post_resource.batch_actions_enabled?).to be_falsey
+    expect(post_resource.batch_actions).to be_empty
 
     post_resource.batch_actions = true
-    post_resource.batch_actions_enabled?.should == true
-    post_resource.batch_actions.should_not be_empty
+    expect(post_resource.batch_actions_enabled?).to be_truthy
+    expect(post_resource.batch_actions).to_not be_empty
   end
 
   it "should inherit the setting from the namespace when set to nil" do
     ns.batch_actions = true
 
     post_resource.batch_actions = true
-    post_resource.batch_actions_enabled?.should == true
-    post_resource.batch_actions.should_not be_empty
+    expect(post_resource.batch_actions_enabled?).to be_truthy
+    expect(post_resource.batch_actions).to_not be_empty
 
     post_resource.batch_actions = nil
-    post_resource.batch_actions_enabled?.should == true # inherited from namespace
-    post_resource.batch_actions.should_not be_empty
+    expect(post_resource.batch_actions_enabled?).to be_truthy # inherited from namespace
+    expect(post_resource.batch_actions).to_not be_empty
   end
 end

data/spec/unit/belongs_to_spec.rb

@@ -1,32 +1,25 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Resource::BelongsTo do
 
-
-  let(:application){ ActiveAdmin::Application.new }
-  let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
-  let(:post){ namespace.register(Post) }
-  let(:belongs_to){ ActiveAdmin::Resource::BelongsTo.new(post, :user) }
+  let(:user_config){ ActiveAdmin.register User }
+  let(:post_config){ ActiveAdmin.register Post do belongs_to :user end }
+  let(:belongs_to){ post_config.belongs_to_config }
 
   it "should have an owner" do
-    belongs_to.owner.should == post
-  end
-
-  it "should have a namespace" do
-    belongs_to.namespace.should == namespace
+    expect(belongs_to.owner).to eq post_config
   end
 
   describe "finding the target" do
     context "when the resource has been registered" do
-      let(:user){ namespace.register(User) }
-      before { user } # Ensure user is registered
-
       it "should return the target resource" do
-        belongs_to.target.should == user
+        expect(belongs_to.target).to eq user_config
       end
     end
 
     context "when the resource has not been registered" do
+      let(:belongs_to){ ActiveAdmin::Resource::BelongsTo.new post_config, :missing }
+
       it "should raise a ActiveAdmin::BelongsTo::TargetNotFound" do
         expect {
           belongs_to.target
@@ -36,7 +29,23 @@ describe ActiveAdmin::Resource::BelongsTo do
   end
 
   it "should be optional" do
-    belongs_to = ActiveAdmin::Resource::BelongsTo.new post, :user, :optional => true
-    belongs_to.should be_optional
+    belongs_to = ActiveAdmin::Resource::BelongsTo.new post_config, :user, optional: true
+    expect(belongs_to).to be_optional
+  end
+
+  describe "controller" do
+    let(:controller) { post_config.controller.new }
+    before do
+      user = User.create!
+      request = double 'Request', format: 'application/json'
+      allow(controller).to receive(:params) { {user_id: user.id} }
+      allow(controller).to receive(:request){ request }
+    end
+    it 'should be able to access the collection' do
+      expect(controller.send :collection).to be_a ActiveRecord::Relation
+    end
+    it 'should be able to build a new resource' do
+      expect(controller.send :build_resource).to be_a Post
+    end
   end
 end

data/spec/unit/cancan_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::CanCanAdapter do
 
@@ -28,13 +28,13 @@ describe ActiveAdmin::CanCanAdapter do
     end
 
     it "should initialize the ability stored in the namespace configuration" do
-      auth.authorized?(:read, Post).should == true
-      auth.authorized?(:update, Post).should == false
+      expect(auth.authorized?(:read, Post)).to eq true
+      expect(auth.authorized?(:update, Post)).to eq false
     end
 
     it "should scope the collection with accessible_by" do
       collection = double
-      collection.should_receive(:accessible_by).with(auth.cancan_ability, :edit)
+      expect(collection).to receive(:accessible_by).with(auth.cancan_ability, :edit)
       auth.scope_collection(collection, :edit)
     end
 

data/spec/unit/comments_spec.rb

@@ -1,71 +1,132 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Comments" do
-  let(:application){ ActiveAdmin::Application.new }
+  let(:application) { ActiveAdmin::Application.new }
 
   describe ActiveAdmin::Comment do
-    subject { ActiveAdmin::Comment.new }
-
-    describe "Associations and Validations" do
-      it { should belong_to :resource }
-      it { should belong_to :author }
-      it { should validate_presence_of :resource }
-      it { should validate_presence_of :body }
-      it { should validate_presence_of :namespace }
+    subject(:comment){ ActiveAdmin::Comment.new }
+
+    it "has valid Associations and Validations" do
+      expect(comment).to belong_to :resource
+      expect(comment).to belong_to :author
+      expect(comment).to validate_presence_of :resource
+      expect(comment).to validate_presence_of :body
+      expect(comment).to validate_presence_of :namespace
     end
 
     describe ".find_for_resource_in_namespace" do
-      let(:post){ Post.create!(:title => "Hello World") }
-      let(:namespace_name){ "admin" }
+      let(:post) { Post.create!(title: "Hello World") }
+      let(:namespace_name) { "admin" }
 
       before do
-        @comment = ActiveAdmin::Comment.create! :resource => post,
-                                                :body => "A Comment",
-                                                :namespace => namespace_name
+        @comment = ActiveAdmin::Comment.create! resource: post,
+                                                body: "A Comment",
+                                                namespace: namespace_name
       end
 
       it "should return a comment for the resource in the same namespace" do
-        ActiveAdmin::Comment.find_for_resource_in_namespace(post, namespace_name).should == [@comment]
+        expect(ActiveAdmin::Comment.find_for_resource_in_namespace(post, namespace_name)).to eq [@comment]
       end
 
       it "should not return a comment for the same resource in a different namespace" do
-        ActiveAdmin::Comment.find_for_resource_in_namespace(post, 'public').should == []
+        expect(ActiveAdmin::Comment.find_for_resource_in_namespace(post, 'public')).to eq []
       end
 
       it "should not return a comment for a different resource" do
-        another_post = Post.create! :title => "Another Hello World"
-        ActiveAdmin::Comment.find_for_resource_in_namespace(another_post, namespace_name).should == []
+        another_post = Post.create! title: "Another Hello World"
+        expect(ActiveAdmin::Comment.find_for_resource_in_namespace(another_post, namespace_name)).to eq []
+      end
+
+      it "should return the most recent comment first" do
+        ActiveAdmin::Comment.class_eval { attr_accessible :created_at } if Rails::VERSION::MAJOR == 3
+        another_comment = ActiveAdmin::Comment.create! resource: post, 
+                                                       body: "Another Comment", 
+                                                       namespace: namespace_name,
+                                                       created_at: @comment.created_at + 20.minutes
+
+        yet_another_comment = ActiveAdmin::Comment.create! resource: post,
+                                                           body: "Yet Another Comment",
+                                                           namespace: namespace_name,
+                                                           created_at: @comment.created_at + 10.minutes
+
+        comments = ActiveAdmin::Comment.find_for_resource_in_namespace(post, namespace_name)
+        expect(comments.size).to eq 3
+        expect(comments.first).to eq(@comment)
+        expect(comments.second).to eq(yet_another_comment)
+        expect(comments.last).to eq(another_comment)
       end
     end
 
     describe ".resource_id_cast" do
-      let(:post) { Post.create!(:title => "Testing.") }
+      let(:post) { Post.create!(title: "Testing.") }
       let(:namespace_name) { "admin" }
 
       it "should cast resource_id as string" do
-        comment = ActiveAdmin::Comment.create! :resource => post,
-                                                :body => "Another Comment",
-                                                :namespace => namespace_name
-        ActiveAdmin::Comment.resource_id_cast(comment).class.should eql String
+        comment = ActiveAdmin::Comment.create! resource: post,
+                                                body: "Another Comment",
+                                                namespace: namespace_name
+        expect(ActiveAdmin::Comment.resource_id_cast(comment).class).to eql String
+      end
+    end
+
+    describe ".resource_type" do
+      let(:post) { Post.create!(title: "Testing.") }
+      let(:post_decorator) { double 'PostDecorator' }
+
+      before do
+        allow(post_decorator).to receive(:model).and_return(post)
+        allow(post_decorator).to receive(:decorated?).and_return(true)
+      end
+
+      context "when a decorated object is passed" do
+        let(:resource) { post_decorator }
+
+        it "returns undeorated object class string" do
+          expect(ActiveAdmin::Comment.resource_type resource).to eql 'Post'
+        end
+      end
+
+      context "when an undecorated object is passed" do
+        let(:resource) { post }
+
+        it "returns object class string" do
+          expect(ActiveAdmin::Comment.resource_type resource).to eql 'Post'
+        end
       end
     end
 
     describe ".resource_id_type" do
       it "should be :string" do
-        ActiveAdmin::Comment.resource_id_type.should eql :string
+        expect(ActiveAdmin::Comment.resource_id_type).to eql :string
       end
     end
 
     describe "Commenting on resource with string id" do
-      let(:tag){ Tag.create!(:name => "cooltags") }
-      let(:namespace_name){ "admin" }
+      let(:tag) { Tag.create!(name: "cooltags") }
+      let(:namespace_name) { "admin" }
 
       it "should allow commenting" do
-        comment = ActiveAdmin::Comment.create! :resource => tag,
-                                                :body => "Another Comment",
-                                                :namespace => namespace_name
+        comment = ActiveAdmin::Comment.create!(
+          resource: tag,
+          body: "Another Comment",
+          namespace: namespace_name)
 
-        ActiveAdmin::Comment.find_for_resource_in_namespace(tag, namespace_name).should == [comment]
+        expect(ActiveAdmin::Comment.find_for_resource_in_namespace(tag, namespace_name)).to eq [comment]
+      end
+    end
+
+    describe "commenting on child of STI resource" do
+      let(:publisher) { Publisher.create!(username: "tenderlove") }
+      let(:namespace_name) { "admin" }
+
+      it "should assign child class as commented resource" do
+        comment = ActiveAdmin::Comment.create!(
+          resource: publisher,
+          body: "Lorem Ipsum",
+          namespace: namespace_name)
+
+        expect(ActiveAdmin::Comment.find_for_resource_in_namespace(publisher, namespace_name).last.resource_type).
+          to eq("User")
       end
     end
   end
@@ -75,16 +136,15 @@ describe "Comments" do
 
       it "should have comments when the namespace allows comments" do
         ns = ActiveAdmin::Namespace.new(application, :admin)
-        ns.allow_comments = true
-        ns.comments?.should be_true
+        ns.comments = true
+        expect(ns.comments?).to be_truthy
       end
 
       it "should not have comments when the namespace does not allow comments" do
         ns = ActiveAdmin::Namespace.new(application, :admin)
-        ns.allow_comments = false
-        ns.comments?.should be_false
+        ns.comments = false
+        expect(ns.comments?).to be_falsey
       end
-
     end
   end
 
@@ -92,15 +152,15 @@ describe "Comments" do
     it "should add an attr_accessor :comments to ActiveAdmin::Resource" do
       ns = ActiveAdmin::Namespace.new(application, :admin)
       resource = ActiveAdmin::Resource.new(ns, Post)
-      resource.comments.should be_nil
+      expect(resource.comments).to be_nil
       resource.comments = true
-      resource.comments.should be_true
+      expect(resource.comments).to be_truthy
     end
     it "should disable comments if set to false" do
       ns = ActiveAdmin::Namespace.new(application, :admin)
       resource = ActiveAdmin::Resource.new(ns, Post)
       resource.comments = false
-      resource.comments?.should be_false
+      expect(resource.comments?).to be_falsey
     end
   end
 end

data/spec/unit/component_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 class MockComponentClass < ActiveAdmin::Component; end
 
@@ -8,11 +8,11 @@ describe ActiveAdmin::Component do
   let(:component){ component_class.new }
 
   it "should be a subclass of an html div" do
-    ActiveAdmin::Component.ancestors.should include(Arbre::HTML::Div)
+    expect(ActiveAdmin::Component.ancestors).to include(Arbre::HTML::Div)
   end
 
   it "should render to a div, even as a subclass" do
-    component.tag_name.should == 'div'
+    expect(component.tag_name).to eq 'div'
   end
 
 end

data/spec/unit/config_shared_examples.rb

@@ -1,13 +1,13 @@
-shared_examples_for "ActiveAdmin::Config" do
+shared_examples_for "ActiveAdmin::Resource" do
   describe "namespace" do
     it "should return the namespace" do
-      config.namespace.should == namespace
+      expect(config.namespace).to eq(namespace)
     end
   end
 
   describe "page_presenters" do
     it "should return an empty hash by default" do
-      config.page_presenters.should == {}
+      expect(config.page_presenters).to eq({})
     end
   end
 
@@ -34,24 +34,24 @@ shared_examples_for "ActiveAdmin::Config" do
     describe "#menu_item_options" do
 
       it "initializes a new menu item with defaults" do
-          config.menu_item_options[:label].call.should == config.plural_resource_label
+          expect(config.menu_item_options[:label].call).to eq(config.plural_resource_label)
       end
 
       it "initialize a new menu item with custom options" do
-        config.menu_item_options = { :label => "Hello" }
-        config.menu_item_options[:label].should == "Hello"
+        config.menu_item_options = { label: "Hello" }
+        expect(config.menu_item_options[:label]).to eq("Hello")
       end
 
     end
 
     describe "#include_in_menu?" do
       it "should be included in menu by default" do
-        config.include_in_menu?.should == true
+        expect(config.include_in_menu?).to eq(true)
       end
 
       it "should not be included in menu when menu set to false" do
         config.menu_item_options = false
-        config.include_in_menu?.should == false
+        expect(config.include_in_menu?).to eq(false)
       end
     end
 

data/spec/unit/controller_filters_spec.rb

@@ -1,32 +1,44 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Application do
   let(:application){ ActiveAdmin::Application.new }
-  let(:controllers){ [ActiveAdmin::BaseController,            ActiveAdmin::Devise::SessionsController,
-                      ActiveAdmin::Devise::UnlocksController, ActiveAdmin::Devise::PasswordsController] }
+  let(:controllers){ application.controllers_for_filters }
+
+  it 'controllers_for_filters' do
+    expect(application.controllers_for_filters).to eq [
+      ActiveAdmin::BaseController, ActiveAdmin::Devise::SessionsController,
+      ActiveAdmin::Devise::PasswordsController, ActiveAdmin::Devise::UnlocksController,
+      ActiveAdmin::Devise::RegistrationsController, ActiveAdmin::Devise::ConfirmationsController
+    ]
+  end
 
   it 'before_filter' do
-    controllers.each{ |c| c.should_receive(:before_filter).and_return(true) }
-    application.before_filter :my_filter, :only => :show
+    controllers.each{ |c| expect(c).to receive(:before_filter).and_return(true) }
+    application.before_filter :my_filter, only: :show
   end
 
   it 'skip_before_filter' do
-    controllers.each{ |c| c.should_receive(:skip_before_filter).and_return(true) }
-    application.skip_before_filter :my_filter, :only => :show
+    controllers.each{ |c| expect(c).to receive(:skip_before_filter).and_return(true) }
+    application.skip_before_filter :my_filter, only: :show
   end
 
   it 'after_filter' do
-    controllers.each{ |c| c.should_receive(:after_filter).and_return(true) }
-    application.after_filter :my_filter, :only => :show
+    controllers.each{ |c| expect(c).to receive(:after_filter).and_return(true) }
+    application.after_filter :my_filter, only: :show
+  end
+
+  it 'skip after_filter' do
+    controllers.each{ |c| expect(c).to receive(:skip_after_filter).and_return(true) }
+    application.skip_after_filter :my_filter, only: :show
   end
 
   it 'around_filter' do
-    controllers.each{ |c| c.should_receive(:around_filter).and_return(true) }
-    application.around_filter :my_filter, :only => :show
+    controllers.each{ |c| expect(c).to receive(:around_filter).and_return(true) }
+    application.around_filter :my_filter, only: :show
   end
-  
+
   it 'skip_filter' do
-    controllers.each{ |c| c.should_receive(:skip_filter).and_return(true) }
-    application.skip_filter :my_filter, :only => :show
+    controllers.each{ |c| expect(c).to receive(:skip_filter).and_return(true) }
+    application.skip_filter :my_filter, only: :show
   end
 end