spec/unit/resource_registration_spec.rb in activeadmin-0.6.6 vs spec/unit/resource_registration_spec.rb in activeadmin-1.0.0.pre1

@@ -1,56 +1,56 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Registering an object to administer" do
   application = ActiveAdmin::Application.new
 
   context "with no configuration" do
     namespace = ActiveAdmin::Namespace.new(application, :admin)
     it "should call register on the namespace" do
       application.namespaces[namespace.name] = namespace
-      namespace.should_receive(:register)
+      expect(namespace).to receive(:register)
 
       application.register Category
     end
 
     it "should dispatch a Resource::RegisterEvent" do
-      ActiveAdmin::Event.should_receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
+      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
       application.register Category
     end
   end
 
   context "with a different namespace" do
     it "should call register on the namespace" do
       namespace = ActiveAdmin::Namespace.new(application, :hello_world)
       application.namespaces[namespace.name] = namespace
-      namespace.should_receive(:register)
+      expect(namespace).to receive(:register)
 
-      application.register Category, :namespace => :hello_world
+      application.register Category, namespace: :hello_world
     end
 
     it "should generate a Namespace::RegisterEvent and a Resource::RegisterEvent" do
-      ActiveAdmin::Event.should_receive(:dispatch).with(ActiveAdmin::Namespace::RegisterEvent, an_instance_of(ActiveAdmin::Namespace))
-      ActiveAdmin::Event.should_receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
-      application.register Category, :namespace => :not_yet_created
+      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Namespace::RegisterEvent, an_instance_of(ActiveAdmin::Namespace))
+      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
+      application.register Category, namespace: :not_yet_created
     end
   end
 
   context "with no namespace" do
     it "should call register on the root namespace" do
       namespace = ActiveAdmin::Namespace.new(application, :root)
       application.namespaces[namespace.name] = namespace
-      namespace.should_receive(:register)
+      expect(namespace).to receive(:register)
 
-      application.register Category, :namespace => false
+      application.register Category, namespace: false
     end
   end
 
   context "when being registered multiple times" do
     it "should run the dsl in the same config object" do
       config_1 = ActiveAdmin.register(Category) { filter :name }
       config_2 = ActiveAdmin.register(Category) { filter :id }
-      config_1.should == config_2
-      config_1.filters.size.should == 2
+      expect(config_1).to eq config_2
+      expect(config_1.filters.size).to eq 2
     end
   end
 
 end