From d7a11503af419a5336465ff73465a738f7cd5d8d Mon Sep 17 00:00:00 2001 From: Larry Gilbert Date: Tue, 6 Aug 2013 08:44:47 -0700 Subject: [PATCH] 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 | 6 +++--- spec/{ => integration}/integration_spec.rb | 5 +---- spec/integration/request_spec.rb | 10 +++++++++- spec/spec_helper.rb | 1 + spec/{ => unit}/abstract_response_spec.rb | 2 +- spec/{ => unit}/exceptions_spec.rb | 5 +---- spec/{ => unit}/master_shake.jpg | Bin spec/{ => unit}/payload_spec.rb | 3 ++- spec/{ => unit}/raw_response_spec.rb | 2 +- spec/{ => unit}/request2_spec.rb | 5 +---- spec/{ => unit}/request_spec.rb | 5 +---- spec/{ => unit}/resource_spec.rb | 5 +---- spec/{ => unit}/response_spec.rb | 5 +---- spec/{ => unit}/restclient_spec.rb | 2 +- 14 files changed, 24 insertions(+), 32 deletions(-) rename spec/{ => integration}/integration_spec.rb (90%) rename spec/{ => unit}/abstract_response_spec.rb (97%) rename spec/{ => unit}/exceptions_spec.rb (96%) rename spec/{ => unit}/master_shake.jpg (100%) rename spec/{ => unit}/payload_spec.rb (99%) rename spec/{ => unit}/raw_response_spec.rb (84%) rename spec/{ => unit}/request2_spec.rb (93%) rename spec/{ => unit}/request_spec.rb (99%) rename spec/{ => unit}/resource_spec.rb (97%) rename spec/{ => unit}/response_spec.rb (98%) rename spec/{ => unit}/restclient_spec.rb (96%) diff --git a/Rakefile b/Rakefile index f068230..d4c43a7 100644 --- a/Rakefile +++ b/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" diff --git a/spec/integration_spec.rb b/spec/integration/integration_spec.rb similarity index 90% rename from spec/integration_spec.rb rename to spec/integration/integration_spec.rb index f5d536f..a0f32ce 100644 --- a/spec/integration_spec.rb +++ b/spec/integration/integration_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' describe RestClient do diff --git a/spec/integration/request_spec.rb b/spec/integration/request_spec.rb index e0ac40c..c6f6bd0 100644 --- a/spec/integration/request_spec.rb +++ b/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( diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dcbcbd1..cb8e9dc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,4 +8,5 @@ rescue LoadError # NOP, ignore end +require 'webmock/rspec' require 'restclient' diff --git a/spec/abstract_response_spec.rb b/spec/unit/abstract_response_spec.rb similarity index 97% rename from spec/abstract_response_spec.rb rename to spec/unit/abstract_response_spec.rb index 7089334..83928cf 100644 --- a/spec/abstract_response_spec.rb +++ b/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 diff --git a/spec/exceptions_spec.rb b/spec/unit/exceptions_spec.rb similarity index 96% rename from spec/exceptions_spec.rb rename to spec/unit/exceptions_spec.rb index cceeaec..5d86373 100644 --- a/spec/exceptions_spec.rb +++ b/spec/unit/exceptions_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' 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 diff --git a/spec/master_shake.jpg b/spec/unit/master_shake.jpg similarity index 100% rename from spec/master_shake.jpg rename to spec/unit/master_shake.jpg diff --git a/spec/payload_spec.rb b/spec/unit/payload_spec.rb similarity index 99% rename from spec/payload_spec.rb rename to spec/unit/payload_spec.rb index ee8fbbe..5fc7457 100644 --- a/spec/payload_spec.rb +++ b/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 diff --git a/spec/raw_response_spec.rb b/spec/unit/raw_response_spec.rb similarity index 84% rename from spec/raw_response_spec.rb rename to spec/unit/raw_response_spec.rb index 138fb93..d95e965 100644 --- a/spec/raw_response_spec.rb +++ b/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 diff --git a/spec/request2_spec.rb b/spec/unit/request2_spec.rb similarity index 93% rename from spec/request2_spec.rb rename to spec/unit/request2_spec.rb index 72f8cd6..8800b95 100644 --- a/spec/request2_spec.rb +++ b/spec/unit/request2_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' describe RestClient::Request do diff --git a/spec/request_spec.rb b/spec/unit/request_spec.rb similarity index 99% rename from spec/request_spec.rb rename to spec/unit/request_spec.rb index 6360bde..24c55d6 100644 --- a/spec/request_spec.rb +++ b/spec/unit/request_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' describe RestClient::Request do before do diff --git a/spec/resource_spec.rb b/spec/unit/resource_spec.rb similarity index 97% rename from spec/resource_spec.rb rename to spec/unit/resource_spec.rb index 6642c0f..e696397 100644 --- a/spec/resource_spec.rb +++ b/spec/unit/resource_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' describe RestClient::Resource do before do diff --git a/spec/response_spec.rb b/spec/unit/response_spec.rb similarity index 98% rename from spec/response_spec.rb rename to spec/unit/response_spec.rb index 2bee10b..6d78d22 100644 --- a/spec/response_spec.rb +++ b/spec/unit/response_spec.rb @@ -1,7 +1,4 @@ -require File.join( File.dirname(File.expand_path(__FILE__)), 'spec_helper') - -require 'webmock/rspec' -include WebMock::API +require 'spec_helper' describe RestClient::Response do before do diff --git a/spec/restclient_spec.rb b/spec/unit/restclient_spec.rb similarity index 96% rename from spec/restclient_spec.rb rename to spec/unit/restclient_spec.rb index 1882091..b6d2ce8 100644 --- a/spec/restclient_spec.rb +++ b/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