puffing-billy 0.1.3 → 0.2.0

data/Gemfile.lock

@@ -13,22 +13,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
-    capybara (1.1.2)
+    addressable (2.3.3)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    capybara-webkit (0.12.1)
-      capybara (>= 1.0.0, < 1.2)
+      xpath (~> 1.0.0)
+    capybara-webkit (0.14.2)
+      capybara (~> 2.0, >= 2.0.2)
       json
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
     cookiejar (0.3.0)
     daemons (1.1.9)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
@@ -37,49 +38,64 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.0)
+    eventmachine (1.0.1)
     eventmachine_httpserver (0.2.1)
-    faraday (0.8.4)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
-    faye-websocket (0.4.6)
+    faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
-    ffi (1.1.5)
+    ffi (1.4.0)
+    guard (1.6.2)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
+      thor (>= 0.14.6)
     http_parser.rb (0.5.3)
-    json (1.7.5)
-    libwebsocket (0.1.5)
-      addressable
-    mime-types (1.19)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    nokogiri (1.5.5)
-    poltergeist (0.7.0)
-      capybara (~> 1.1)
-      childprocess (~> 0.3)
+    json (1.7.7)
+    listen (0.7.3)
+    lumberjack (1.0.2)
+    method_source (0.8.1)
+    mime-types (1.21)
+    multi_json (1.6.1)
+    multipart-post (1.2.0)
+    nokogiri (1.5.6)
+    poltergeist (1.1.0)
+      capybara (~> 2.0, >= 2.0.1)
       faye-websocket (~> 0.4, >= 0.4.4)
       http_parser.rb (~> 0.5.3)
-      multi_json (~> 1.0)
-    rack (1.4.1)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.30.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    thin (1.4.1)
+      websocket (~> 1.0.4)
+    slop (3.4.3)
+    terminal-table (1.4.5)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    xpath (0.1.4)
+    thor (0.17.0)
+    websocket (1.0.7)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
 
@@ -89,9 +105,11 @@ PLATFORMS
 DEPENDENCIES
   capybara-webkit
   faraday
+  guard
   poltergeist
   puffing-billy!
   rack
+  rb-inotify
   rspec
   selenium-webdriver
   thin

data/Guardfile

@@ -0,0 +1,23 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/README.md

@@ -3,8 +3,8 @@
 A rewriting web proxy for testing interactions between your browser and
 external sites. Works with ruby + rspec.
 
-Puffing Billy is like [webmock](https://github.com/bblimke/webmock), but for
-your browser.
+Puffing Billy is like [webmock](https://github.com/bblimke/webmock) or
+[VCR](https://github.com/vcr/vcr), but for your browser.
 
 ![](http://upload.wikimedia.org/wikipedia/commons/0/01/Puffing_Billy_1862.jpg)
 
@@ -21,12 +21,15 @@ you can test it!
 
 ```ruby
 it 'should stub google' do
-  proxy.stub('http://www.google.com').and_return(:text => "I'm not Google!")
-  visit 'http://www.google.com'
+  proxy.stub('http://www.google.com/').and_return(:text => "I'm not Google!")
+  visit 'http://www.google.com/'
   page.should have_content("I'm not Google!")
 end
 ```
 
+You can also record HTTP interactions and replay them later. See
+[caching](#caching) below.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -58,17 +61,17 @@ In your tests:
 
 ```ruby
 # Stub and return text, json, jsonp (or anything else)
-proxy.stub('http://example.com/text').and_return(:text => 'Foobar')
-proxy.stub('http://example.com/json').and_return(:json => { :foo => 'bar' })
-proxy.stub('http://example.com/jsonp').and_return(:jsonp => { :foo => 'bar' })
-proxy.stub('http://example.com/wtf').and_return(:body => 'WTF!?', :content_type => 'text/wtf')
+proxy.stub('http://example.com/text/').and_return(:text => 'Foobar')
+proxy.stub('http://example.com/json/').and_return(:json => { :foo => 'bar' })
+proxy.stub('http://example.com/jsonp/').and_return(:jsonp => { :foo => 'bar' })
+proxy.stub('http://example.com/wtf/').and_return(:body => 'WTF!?', :content_type => 'text/wtf')
 
 # Stub redirections and other return codes
-proxy.stub('http://example.com/redirect').and_return(:redirect_to => 'http://example.com/other')
-proxy.stub('http://example.com/missing').and_return(:code => 404, :body => 'Not found')
+proxy.stub('http://example.com/redirect/').and_return(:redirect_to => 'http://example.com/other')
+proxy.stub('http://example.com/missing/').and_return(:code => 404, :body => 'Not found')
 
 # Even stub HTTPS!
-proxy.stub('https://example.com/secure').and_return(:text => 'secrets!!1!')
+proxy.stub('https://example.com:443/secure/').and_return(:text => 'secrets!!1!')
 
 # Pass a Proc (or Proc-style object) to create dynamic responses.
 #
@@ -77,7 +80,7 @@ proxy.stub('https://example.com/secure').and_return(:text => 'secrets!!1!')
 #   headers: Headers hash
 #   body:    Request body string
 #
-proxy.stub('https://example.com/proc').and_return(Proc.new { |params, headers, body|
+proxy.stub('https://example.com/proc/').and_return(Proc.new { |params, headers, body|
   { :text => "Hello, #{params['name'][0]}"}
 })
 ```
@@ -85,6 +88,54 @@ proxy.stub('https://example.com/proc').and_return(Proc.new { |params, headers, b
 Stubs are reset between tests.  Any requests that are not stubbed will be
 proxied to the remote server.
 
+## Caching
+
+Requests routed through the external proxy are cached.
+
+By default, all requests to localhost or 127.0.0.1 will not be cached. If
+you're running your test server with a different hostname, you'll need to
+add that host to puffing-billy's whitelist.
+
+In your `spec_helper.rb`:
+
+```ruby
+Billy.configure do |c|
+  c.whitelist = ['test.host', 'localhost', '127.0.0.1']
+end
+```
+
+If you want to use puffing-billy like you would [VCR](https://github.com/vcr/vcr)
+you can turn on cache persistence. This way you don't have to manually mock out
+everything as requests are automatically recorded and played back. With cache
+persistence you can take tests completely offline.
+
+```ruby
+Billy.configure do |c|
+  c.cache = true
+  c.ignore_params = ["http://www.google-analytics.com/__utm.gif",
+                     "https://r.twimg.com/jot",
+                     "http://p.twitter.com/t.gif",
+                     "http://p.twitter.com/f.gif",
+                     "http://www.facebook.com/plugins/like.php",
+                     "https://www.facebook.com/dialog/oauth",
+                     "http://cdn.api.twitter.com/1/urls/count.json"]
+  c.persist_cache = true
+  c.cache_path = 'spec/req_cache/'
+end
+
+# need to call this because of a race condition between persist_cache
+# being set and the proxy being loaded for the first time
+Billy.proxy.restore_cache
+```
+
+`c.ignore_params` is used to ignore parameters of certain requests when
+caching. You should mostly use this for analytics and various social buttons as
+they use cache avoidance techniques, but return practically the same response
+that most often does not affect your test results.
+
+The cache works with all types of requests and will distinguish between
+different POST requests to the same URL.
+
 ## Customising the javascript driver
 
 If you use a customised Capybara driver, remember to set the proxy address
@@ -109,6 +160,5 @@ to see how Billy's default drivers are configured.
 ## TODO
 
 1. Integration for test frameworks other than rspec.
-2. Caching (for super awesome improved test performance).
-3. Show errors from the EventMachine reactor loop in the test output.
+2. Show errors from the EventMachine reactor loop in the test output.
 

data/lib/billy/cache.rb

@@ -1,39 +1,89 @@
 require 'resolv'
 require 'uri'
+require 'yaml'
 
 module Billy
   class Cache
     def initialize
       reset
+      load_dir
     end
 
     def cacheable?(url, headers)
       if Billy.config.cache
         host = URI(url).host
-        Billy.log(:info, Billy.config.whitelist)
         !Billy.config.whitelist.include?(host)
         # TODO test headers for cacheability
       end
     end
 
-    def cached?(url)
-      !@cache[url].nil?
+    def cached?(method, url, body)
+      !@cache[key(method, url, body)].nil?
     end
 
-    def fetch(url)
-      @cache[url]
+    def fetch(method, url, body)
+      @cache[key(method, url, body)]
     end
 
-    def store(url, status, headers, content)
-      @cache[url] = {
+    def store(method, url, body, status, headers, content)
+      cached = {
+        :url => url,
+        :body => body,
         :status => status,
+        :method => method,
         :headers => headers,
         :content => content
       }
+
+      @cache[key(method, url, body)] = cached
+
+      if Billy.config.persist_cache
+        Dir.mkdir(Billy.config.cache_path) unless File.exists?(Billy.config.cache_path)
+
+        begin
+          path = File.join(Billy.config.cache_path,
+                           "#{key(method, url, body)}.yml")
+          File.open(path, 'w') do |f|
+            f.write(cached.to_yaml(:Encoding => :Utf8))
+          end
+        rescue StandardError => e
+        end
+      end
     end
 
     def reset
       @cache = {}
     end
+
+    def load_dir
+      if Billy.config.persist_cache
+        Dir.glob(Billy.config.cache_path+"*.yml") { |filename|
+          data = begin
+                   YAML.load(File.open(filename))
+                 rescue ArgumentError => e
+                   puts "Could not parse YAML: #{e.message}"
+                 end
+
+          @cache[key(data[:method], data[:url], data[:body])] = data
+        }
+      end
+    end
+
+    def key(method, url, body)
+      url = URI(url)
+      no_params = url.scheme+'://'+url.host+url.path
+
+      if Billy.config.ignore_params.include?(no_params)
+        url = URI(no_params)
+      end
+
+      key = method+'_'+url.host+'_'+Digest::SHA1.hexdigest(url.to_s)
+
+      if method == 'post' and !Billy.config.ignore_params.include?(no_params)
+        key += '_'+Digest::SHA1.hexdigest(body.to_s)
+      end
+
+      key
+    end
   end
 end

data/lib/billy/config.rb

@@ -1,15 +1,23 @@
 require 'logger'
+require 'tmpdir'
 
 module Billy
   class Config
     DEFAULT_WHITELIST = ['127.0.0.1', 'localhost']
 
-    attr_accessor :logger, :cache, :whitelist
+    attr_accessor :logger, :cache, :whitelist, :ignore_params, :persist_cache, :cache_path
 
     def initialize
-      @logger    = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
-      @cache     = true
+      @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+      reset
+    end
+
+    def reset
+      @cache = true
       @whitelist = DEFAULT_WHITELIST
+      @ignore_params = []
+      @persist_cache = false
+      @cache_path = Dir.tmpdir
     end
   end
 

data/lib/billy/proxy.rb

@@ -41,7 +41,7 @@ module Billy
 
     def stub(url, options = {})
       ret = ProxyRequestStub.new(url, options)
-      @stubs << ret
+      @stubs.unshift ret
       ret
     end
 
@@ -53,13 +53,15 @@ module Billy
       @cache.reset
     end
 
+    def restore_cache
+      @cache.reset
+      @cache.load_dir
+    end
+
     protected
 
     def find_stub(method, url)
-      @stubs.each do |stub|
-        return stub if stub.matches?(method, url)
-      end
-      nil
+      @stubs.find {|stub| stub.matches?(method, url) }
     end
 
     def main_loop

data/lib/billy/proxy_connection.rb

@@ -72,6 +72,7 @@ module Billy
       if handler && handler.respond_to?(:call)
         result = handler.call(@parser.http_method, @url, @headers, @body)
       end
+
       if result
         Billy.log(:info, "STUB #{@parser.http_method} #{@url}")
         response = EM::DelegatedHttpResponse.new(self)
@@ -79,7 +80,7 @@ module Billy
         response.headers = result[1].merge('Connection' => 'close')
         response.content = result[2]
         response.send_response
-      elsif @parser.http_method == 'GET' && cache.cached?(@url)
+      elsif cache.cached?(@parser.http_method.downcase, @url, @body)
         Billy.log(:info, "CACHE #{@parser.http_method} #{@url}")
         respond_from_cache
       else
@@ -114,9 +115,10 @@ module Billy
         res_headers = res_headers.merge('Connection' => 'close')
         res_headers.delete('Transfer-Encoding')
         res_content = req.response.force_encoding('BINARY')
-        if @parser.http_method == 'GET' && cache.cacheable?(@url, res_headers)
-          cache.store(@url, res_status, res_headers, res_content)
+        if cache.cacheable?(@url, res_headers)
+          cache.store(@parser.http_method.downcase, @url, @body, res_status, res_headers, res_content)
         end
+
         res = EM::DelegatedHttpResponse.new(self)
         res.status = res_status
         res.headers = res_headers
@@ -126,7 +128,7 @@ module Billy
     end
 
     def respond_from_cache
-      cached_res = cache.fetch(@url)
+      cached_res = cache.fetch(@parser.http_method.downcase, @url, @body)
       res = EM::DelegatedHttpResponse.new(self)
       res.status = cached_res[:status]
       res.headers = cached_res[:headers]

data/lib/billy/rspec.rb

@@ -44,9 +44,9 @@ if defined?(Capybara::Poltergeist)
   end
 end
 
-if defined?(Capybara::Driver::Webkit)
+if defined?(Capybara::Webkit::Driver)
   Capybara.register_driver :webkit_billy do |app|
-    driver = Capybara::Driver::Webkit.new(app)
+    driver = Capybara::Webkit::Driver.new(app)
     driver.browser.set_proxy(:host => Billy.proxy.host,
                              :port => Billy.proxy.port)
     driver.browser.ignore_ssl_errors

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/puffing-billy.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "selenium-webdriver"
   gem.add_development_dependency "capybara-webkit"
   gem.add_development_dependency "rack"
+  gem.add_development_dependency "guard"
+  gem.add_development_dependency "rb-inotify"
   gem.add_runtime_dependency "eventmachine"
   gem.add_runtime_dependency "em-http-request"
   gem.add_runtime_dependency "eventmachine_httpserver"

data/spec/{requests → features}/examples/facebook_api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'base64'
 
-describe 'Facebook API example', :type => :request, :js => true do
+describe 'Facebook API example', :type => :feature, :js => true do
   before do
     proxy.stub('https://www.facebook.com:443/dialog/oauth').and_return(Proc.new { |params,_,_|
       # mock a signed request from facebook.  the JS api never verifies the
@@ -20,4 +20,3 @@ describe 'Facebook API example', :type => :request, :js => true do
     page.should have_content "Hi, Tester 1"
   end
 end
-

data/spec/{requests → features}/examples/tumblr_api_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Tumblr API example', :type => :request, :js => true do
+describe 'Tumblr API example', :type => :feature, :js => true do
   before do
     proxy.stub('http://blog.howmanyleft.co.uk/api/read/json').and_return(
       :jsonp => {
@@ -27,4 +27,3 @@ describe 'Tumblr API example', :type => :request, :js => true do
     page.should have_content('News item 2 content here')
   end
 end
-

data/spec/{requests → lib}/proxy_spec.rb

@@ -71,10 +71,8 @@ shared_examples_for 'a cache' do
   end
 
   context 'other GET requests' do
-    around do |example|
-      Billy.configure { |c| c.whitelist = [] }
-      example.run
-      Billy.configure { |c| c.whitelist = Billy::Config::DEFAULT_WHITELIST }
+    before do
+      Billy.config.whitelist = []
     end
 
     it 'should be cached' do
@@ -87,6 +85,53 @@ shared_examples_for 'a cache' do
       }.to_not change { r.body }
     end
   end
+
+  context 'ignore_params GET requests' do
+    before do
+      Billy.config.ignore_params = ['/analytics']
+    end
+
+    it 'should be cached' do
+      r = http.get('/analytics?some_param=5')
+      r.body.should == 'GET /analytics'
+      expect {
+        expect {
+          r = http.get('/analytics?some_param=20')
+        }.to change { r.headers['HTTP-X-EchoCount'].to_i }.by(1)
+      }.to_not change { r.body }
+    end
+  end
+
+  context "cache persistence" do
+    let(:cached_file) do
+      f = "GET_localhost_#{Digest::SHA1.hexdigest("#{url}/foo")}.yml"
+      File.join(Billy.config.cache_path, f)
+    end
+
+    before { Billy.config.whitelist = [] }
+
+    after do
+      File.delete(cached_file) if File.exists?(cached_file)
+    end
+
+    context "enabled" do
+      before { Billy.config.persist_cache = true }
+
+      it 'should persist' do
+        r = http.get('/foo')
+        File.exists?(cached_file).should be_true
+      end
+    end
+
+    context "disabled" do
+      before { Billy.config.persist_cache = false }
+
+      it 'shouldnt persist' do
+        r = http.get('/foo')
+        File.exists?(cached_file).should be_false
+      end
+    end
+  end
 end
 
 describe Billy::Proxy do
@@ -136,11 +181,13 @@ describe Billy::Proxy do
   context 'caching' do
 
     context 'HTTP' do
+      let!(:url) { @http_url }
       let!(:http) { @http }
       it_should_behave_like 'a cache'
     end
 
     context 'HTTPS' do
+      let!(:url) { @https_url }
       let!(:http) { @https }
       it_should_behave_like 'a cache'
     end

data/spec/spec_helper.rb

@@ -25,4 +25,8 @@ RSpec.configure do |config|
   config.before :each do
     proxy.reset_cache
   end
+
+  config.after :each do
+    Billy.config.reset
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -123,6 +123,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +280,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -267,12 +300,12 @@ files:
 - lib/billy/version.rb
 - log/.gitkeep
 - puffing-billy.gemspec
+- spec/features/examples/facebook_api_spec.rb
+- spec/features/examples/tumblr_api_spec.rb
 - spec/fixtures/test-server.crt
 - spec/fixtures/test-server.key
 - spec/lib/billy/proxy_request_stub_spec.rb
-- spec/requests/examples/facebook_api_spec.rb
-- spec/requests/examples/tumblr_api_spec.rb
-- spec/requests/proxy_spec.rb
+- spec/lib/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_server.rb
 homepage: https://github.com/oesmith/puffing-billy
@@ -300,11 +333,11 @@ signing_key:
 specification_version: 3
 summary: Easy request stubs for browser tests.
 test_files:
+- spec/features/examples/facebook_api_spec.rb
+- spec/features/examples/tumblr_api_spec.rb
 - spec/fixtures/test-server.crt
 - spec/fixtures/test-server.key
 - spec/lib/billy/proxy_request_stub_spec.rb
-- spec/requests/examples/facebook_api_spec.rb
-- spec/requests/examples/tumblr_api_spec.rb
-- spec/requests/proxy_spec.rb
+- spec/lib/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_server.rb