Reorganised folder structure for specs

spec/curb_spec.rb → spec/acceptance/curb/curb_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'curb_spec_helper'
+  require 'acceptance/curb/curb_spec_helper'
 
   shared_examples_for "Curb" do
     include CurbSpecHelper

spec/em_http_request_spec.rb → spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 require 'ostruct'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'em_http_request_spec_helper'
+  require 'acceptance/em_http_request/em_http_request_spec_helper'
 
   describe "Webmock with EM::HttpRequest" do
     include EMHttpRequestSpecHelper

spec/httpclient_spec.rb → spec/acceptance/httpclient/httpclient_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 require 'ostruct'
 
-require 'httpclient_spec_helper'
+require 'acceptance/httpclient/httpclient_spec_helper'
 
 describe "Webmock with HTTPClient" do
   include HTTPClientSpecHelper

spec/net_http_spec.rb → spec/acceptance/net_http/net_http_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
 require 'ostruct'
-require 'net_http_spec_helper'
-require 'net_http_shared'
+require 'acceptance/webmock_shared'
+require 'acceptance/net_http/net_http_spec_helper'
+require 'acceptance/net_http/net_http_shared'
 
 include NetHTTPSpecHelper
 

spec/real_net_http_spec.rb → spec/acceptance/net_http/real_net_http_spec.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rspec'
 require 'net/http'
-require 'net_http_shared'
 require 'net/https'
 require 'stringio'
+require 'acceptance/net_http/net_http_shared'
 require 'support/webmock_server'
 
 describe "Real Net:HTTP without webmock", :without_webmock => true do

spec/patron_spec.rb → spec/acceptance/patron/patron_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'patron_spec_helper'
+  require 'acceptance/patron/patron_spec_helper'
   require 'tmpdir'
   require 'fileutils'
 

spec/typhoeus_hydra_spec.rb → spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'typhoeus_hydra_spec_helper'
+  require 'acceptance/typhoeus/typhoeus_hydra_spec_helper'
 
   describe "Webmock with Typhoeus::Hydra" do
     include TyphoeusHydraSpecHelper

spec/webmock_shared.rb → spec/acceptance/webmock_shared.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 unless defined? SAMPLE_HEADERS
   SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
@@ -667,7 +667,7 @@ def call(request)
         describe "replying raw responses from file" do
 
           before(:each) do
-            @file = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+            @file = File.new(CURL_EXAMPLE_OUTPUT_PATH)
             stub_http_request(:get, "www.example.com").to_return(@file)
             @response = http_request(:get, "http://www.example.com/")
           end
@@ -706,7 +706,7 @@ def call(request)
         describe "replying responses raw responses from string" do
 
           before(:each) do
-            @input = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt").read
+            @input = File.new(CURL_EXAMPLE_OUTPUT_PATH).read
             stub_http_request(:get, "www.example.com").to_return(@input)
             @response = http_request(:get, "http://www.example.com/")
           end
@@ -740,7 +740,7 @@ def call(request)
         describe "replying raw responses evaluated dynamically" do
           before(:each) do
             @files = {
-              "www.example.com" => File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+              "www.example.com" => File.new(CURL_EXAMPLE_OUTPUT_PATH)
             }
           end
 

spec/spec_helper.rb

@@ -13,9 +13,11 @@
 
 require 'webmock/rspec'
 
-require 'network_connection'
+require 'support/network_connection'
 require 'support/webmock_server'
-require 'my_rack_app'
+require 'support/my_rack_app'
+
+CURL_EXAMPLE_OUTPUT_PATH = File.expand_path(File.dirname(__FILE__)) + "/support/example_curl_output.txt" unless defined? CURL_EXAMPLE_OUTPUT_PATH
 
 RSpec.configure do |config|
   unless NetworkConnection.is_network_available?

spec/errors_spec.rb → spec/unit/errors_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "errors" do
   describe WebMock::NetConnectNotAllowedError do

spec/http_lib_adapters/http_lib_adapter_registry_spec.rb → spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::HttpLibAdapterRegistry do
   describe "each_adapter" do

spec/http_lib_adapters/http_lib_adapter_spec.rb → spec/unit/http_lib_adapters/http_lib_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::HttpLibAdapter do
   describe "adapter_for" do

spec/rack_response_spec.rb → spec/unit/rack_response_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RackResponse do
   before :each do

spec/request_execution_verifier_spec.rb → spec/unit/request_execution_verifier_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RequestExecutionVerifier do
   before(:each) do

spec/request_pattern_spec.rb → spec/unit/request_pattern_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RequestPattern do
 

spec/request_registry_spec.rb → spec/unit/request_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RequestRegistry do
 

spec/request_signature_spec.rb → spec/unit/request_signature_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RequestSignature do
 

spec/request_stub_spec.rb → spec/unit/request_stub_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::RequestStub do
 

spec/response_spec.rb → spec/unit/response_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::ResponseFactory do
 
@@ -126,7 +126,7 @@
 
     describe "when input is IO" do
       before(:each) do
-        @file = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+        @file = File.new(CURL_EXAMPLE_OUTPUT_PATH)
         @response = WebMock::Response.new(@file)
       end
 
@@ -157,7 +157,7 @@
 
     describe "when input is String" do
       before(:each) do
-        @input = File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt").read
+        @input = File.new(CURL_EXAMPLE_OUTPUT_PATH).read
         @response = WebMock::Response.new(@input)
       end
 
@@ -241,7 +241,7 @@
       describe "when raw response is evaluated" do
         before(:each) do
           @files = {
-            "www.example.com" => File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+            "www.example.com" => File.new(CURL_EXAMPLE_OUTPUT_PATH)
           }
           @request_signature = WebMock::RequestSignature.new(:get, "www.example.com")
         end

spec/stub_registry_spec.rb → spec/unit/stub_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::StubRegistry do
 

spec/stub_request_snippet_spec.rb → spec/unit/stub_request_snippet_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe WebMock::StubRequestSnippet do
   describe "to_s" do

spec/util/hash_counter_spec.rb → spec/unit/util/hash_counter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::Util::HashCounter do
 

spec/util/hash_keys_stringifier_spec.rb → spec/unit/util/hash_keys_stringifier_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::Util::HashKeysStringifier do
 

spec/util/headers_spec.rb → spec/unit/util/headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::Util::Headers do
 

spec/util/json_spec.rb → spec/unit/util/json_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe WebMock::Util::JSON do
   it "should parse json without parsing dates" do

spec/util/uri_spec.rb → spec/unit/util/uri_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 
 URIS_WITHOUT_PATH_OR_PARAMS =

spec/webmock_spec.rb → spec/unit/webmock_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "WebMock version" do
   it "should report version" do