Reorganize specs

* Put unit and integration specs into separate subdirectories
* Consolidate all requires of 'webmock/rspec' into spec_helper.rb
* Use WebMock.{disable!,enable!} for specs calling live server

Rakefile

@@ -7,11 +7,11 @@ end
 require "rspec/core/rake_task"
 
 desc "Run all specs"
-task :spec => ["spec:unit", "spec:integration"]
+RSpec::Core::RakeTask.new('spec')
 
 desc "Run unit specs"
 RSpec::Core::RakeTask.new('spec:unit') do |t|
-  t.pattern = 'spec/*_spec.rb'
+  t.pattern = 'spec/unit/*_spec.rb'
 end
 
 desc "Run integration specs"
@@ -22,7 +22,7 @@ end
 desc "Print specdocs"
 RSpec::Core::RakeTask.new(:doc) do |t|
   t.rspec_opts = ["--format", "specdoc", "--dry-run"]
-  t.pattern = 'spec/*_spec.rb'
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 desc "Run all examples with RCov"

spec/integration/integration_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient do
 

spec/integration/request_spec.rb

@@ -1,6 +1,14 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), '../spec_helper')
+require 'spec_helper'
 
 describe RestClient::Request do
+  before(:all) do
+    WebMock.disable!
+  end
+
+  after(:all) do
+    WebMock.enable!
+  end
+
   describe "ssl verification" do
     it "is successful with the correct ca_file" do
       request = RestClient::Request.new(

spec/spec_helper.rb

@@ -8,4 +8,5 @@ rescue LoadError
   # NOP, ignore
 end
 
+require 'webmock/rspec'
 require 'restclient'

spec/unit/abstract_response_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
 
 describe RestClient::AbstractResponse do
 

spec/unit/exceptions_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient::Exception do
   it "returns a 'message' equal to the class name if the message is not set, because 'message' should not be nil" do

spec/unit/payload_spec.rb

@@ -1,5 +1,6 @@
 # encoding: binary
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+
+require 'spec_helper'
 
 describe RestClient::Payload do
   context "A regular Payload" do

spec/unit/raw_response_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
 
 describe RestClient::RawResponse do
   before do

spec/unit/request2_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient::Request do
 

spec/unit/request_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient::Request do
   before do

spec/unit/resource_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient::Resource do
   before do

spec/unit/response_spec.rb

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
-
-require 'webmock/rspec'
-include WebMock::API
 
 describe RestClient::Response do
   before do

spec/unit/restclient_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require 'spec_helper'
 
 describe RestClient do
   describe "API" do