simplify paths

lib/cancan.rb

@@ -4,7 +4,7 @@ module CanCan
   class AccessDenied < StandardError; end
 end
 
-require File.dirname(__FILE__) + '/cancan/ability'
-require File.dirname(__FILE__) + '/cancan/controller_resource'
-require File.dirname(__FILE__) + '/cancan/resource_authorization'
-require File.dirname(__FILE__) + '/cancan/controller_additions'
+require 'cancan/ability'
+require 'cancan/controller_resource'
+require 'cancan/resource_authorization'
+require 'cancan/controller_additions'

spec/cancan/ability_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe CanCan::Ability do
   before(:each) do

spec/cancan/controller_additions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe CanCan::ControllerAdditions do
   before(:each) do

spec/cancan/controller_resource_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe CanCan::ControllerResource do
   before(:each) do

spec/cancan/resource_authorization_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe CanCan::ResourceAuthorization do
   before(:each) do

spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'active_support'
 require 'active_record'
 require 'action_controller'
 require 'action_view'
-require File.dirname(__FILE__) + '/../lib/cancan.rb'
+require 'cancan'
 
 Spec::Runner.configure do |config|
   config.mock_with :rr