Update and passing specs

spec/cmtool_menu_spec.rb

@@ -13,21 +13,21 @@ describe Cmtool::Menu do
       base_element = Cmtool::Menu::ElementBase.new
       element_names = Cmtool::Menu::ElementBase.subclasses.map{|e| e.name.sub(/.*::/, '').underscore }
       for element_name in element_names
-        base_element.send("#{element_name}?").should be_false
+        base_element.send("#{element_name}?").should be false
       end
     end
   end
   describe Cmtool::Menu::Group do
     it "should identify itself as such" do
-      Cmtool::Menu::Group.new.group?.should be_true
+      Cmtool::Menu::Group.new.group?.should be true
     end
     it "should not identify as resource link" do
-      Cmtool::Menu::Group.new.resource_link?.should be_false
+      Cmtool::Menu::Group.new.resource_link?.should be false
     end
   end
   describe Cmtool::Menu::ResourceLink do
     it "should identify itself as such" do
-      Cmtool::Menu::ResourceLink.new(User).resource_link?.should be_true
+      Cmtool::Menu::ResourceLink.new(User).resource_link?.should be true
     end
   end
   describe :items do
@@ -105,10 +105,10 @@ describe Cmtool::Menu do
       end
     end
     it 'Should add a engine link' do
-      Cmtool::Menu.items.last.engine_link?.should be_true
+      Cmtool::Menu.items.last.engine_link?.should be true
     end
     it 'Should not identify as a resource link' do
-      Cmtool::Menu.items.last.resource_link?.should be_false
+      Cmtool::Menu.items.last.resource_link?.should be false
     end
 
     it 'should set the path when given as symbol' do

spec/controllers/contact_forms_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cmtool::ContactFormsController do
+describe Cmtool::ContactFormsController, type: :controller do
   routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user

spec/controllers/faqs_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cmtool::FaqsController do
+describe Cmtool::FaqsController, type: :controller do
   routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user

spec/controllers/newsletter_subscriptions_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cmtool::NewsletterSubscriptionsController do
+describe Cmtool::NewsletterSubscriptionsController, type: :controller do
   routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user

spec/controllers/pages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cmtool::PagesController do
+describe Cmtool::PagesController, type: :controller do
   routes { Cmtool::Engine.routes }
   describe 'GET index' do
     it "should render standard view when tree is available" do

spec/models/page_spec.rb

@@ -14,7 +14,7 @@ describe Page do
     it "should not be valid when the parent has a different locale then the page itself" do
       @nl12.parent_id = @en1.id
       @nl12.should_not be_valid
-      @nl12.error_on(:locale).should_not be_empty
+      @nl12.errors[:locale].should_not be_empty
     end
   end
 

spec/spec_helper.rb

@@ -22,7 +22,7 @@ RSpec.configure do |config|
   #config.application = Cmtool::Engine
   #config.include CompanyFactory
   config.include Cmtool::Engine.routes.url_helpers
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
   #config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = true
   config.render_views = true