savon_spec 0.1.6 → 1.1.0

data/.travis.yml

@@ -0,0 +1,14 @@
+# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
+language: "ruby"
+script: "bundle exec rake"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+notifications:
+  irc: "irc.freenode.org#savon"

data/Gemfile

@@ -1,4 +1,2 @@
 source :rubygems
 gemspec
-
-gem "autotest"

data/README.md

@@ -1,115 +1,150 @@
-Savon::Spec
+Savon::Spec [![Build Status](https://secure.travis-ci.org/rubiii/savon_spec.png)](http://travis-ci.org/rubiii/savon_spec)
 ===========
 
-Savon testing library
+Savon testing library.
+
 
 Installation
 ------------
 
 Savon::Spec is available through [Rubygems](http://rubygems.org/gems/savon_spec) and can be installed via:
 
-    $ gem install savon_spec
+```
+$ gem install savon_spec
+```
 
-Dependencies
-------------
 
-Currently, the dependencies are very strict. Savon::Spec is meant to be used with:
+Expects
+-------
+
+Include the `Savon::Spec::Macros` module into your specs:
+
+``` ruby
+RSpec.configure do |config|
+  config.include Savon::Spec::Macros
+end
+```
+
+By including the module you get a `savon` method to mock SOAP requests. Here's a very simple example:
+
+```  ruby
+let(:client) do
+  Savon::Client.new do
+    wsdl.endpoint = "http://example.com"
+    wsdl.namespace = "http://users.example.com"
+  end
+end
+
+before do
+  savon.expects(:get_user)
+end
+
+it "mocks a SOAP request" do
+  client.request(:get_user)
+end
+```
+
+This sets up an expectation for Savon to call the `:get_user` action and the specs should pass without errors.
+Savon::Spec does not execute a POST request to your service, but uses [Savon hooks](http://savonrb.com/#hook_into_the_system) to return a fake response:
+
+``` ruby
+{ :code => 200, :headers => {}, :body => "" }
+```
 
-* [Savon](http://rubygems.org/gems/savon) ~> 0.8.0.beta.3
-* [RSpec](http://rubygems.org/gems/rspec) ~> 2.0.0
-* [Mocha](http://rubygems.org/gems/mocha) ~> 0.9.8
+To further isolate your specs, I'd suggest setting up [FakeWeb](http://rubygems.org/gems/fakeweb) to disallow any HTTP requests.  
 
-Note to self: the required versions for RSpec and Mocha could probably be lower.
 
-Getting started
----------------
+With
+----
 
-### Macros
+Mocking SOAP requests is fine, but what you really need to do is verify whether you're sending the right
+parameters to your service.
 
-Include the `Savon::Spec::Macros` module:
+```  ruby
+before do
+  savon.expects(:get_user).with(:id => 1)
+end
 
-    RSpec.configure do |config|
-      config.include Savon::Spec::Macros
-    end
+it "mocks a SOAP request" do
+  client.request(:get_user) do
+    soap.body = { :id => 1 }
+  end
+end
+```
 
-### Mock
+This checks whether Savon uses the SOAP body Hash you expected and raises a `Savon::Spec::ExpectationError` if it doesn't.
 
-By including the macros, you have access to the `savon` method in your specs. It returns a `Savon::Spec::Mock` instance to set up your expectations. It's based on Mocha and comes with similiar methods:
+```
+Failure/Error: client.request :get_user, :body => { :name => "Dr. Who" }
+Savon::Spec::ExpectationError:
+  expected { :id => 1 } to be sent, got: { :name => "Dr. Who" }
+```
 
-    #expects(soap_action)       # mocks SOAP request to a given SOAP action
-    #stubs(soap_action)         # stubs SOAP requests to a given SOAP action
-    #with(soap_body)            # expects Savon to send a given SOAP body
-    #raises_soap_fault          # raises or acts like there was a SOAP fault
-    #returns(response)          # returns the given response
+You can also pass a block to the `#with` method and receive the `Savon::SOAP::Request` before the POST request is executed.  
+Here's an example of a custom expectation:
 
-### Fixtures
+``` ruby
+savon.expects(:get_user).with do |request|
+  request.soap.body.should include(:id)
+end
+```
 
-Savon::Spec works best with SOAP response fixtures (simple XML files) and a conventional folder structure:
 
-    ~ spec
-      ~ fixtures
-        ~ get_user
-          - single_user.xml
-          - multiple_users.xml
-      + models
-      + controllers
-      + helpers
-      + views
+Returns
+-------
 
-When used inside a Rails 3 application, Savon::Spec uses the command `Rails.root.join("spec", "fixtures")` to locate your fixture directory. In any other case, you have to manually set the fixture path via:
+Instead of the default fake response, you can return a custom HTTP response by passing a Hash to the `#returns` method.  
+If you leave out any of these values, Savon::Spec will add the default values for you.
 
-    Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
+``` ruby
+savon.expects(:get_user).returns(:code => 500, :headers => {}, :body => "save the unicorns")
+```
 
-The directories inside the fixture directory should map to SOAP actions and the XML fixtures inside those directories should describe the SOAP response. Please take a look at the following examples to better understand this convention.
+Savon::Spec also works with SOAP response fixtures (simple XML files) and a conventional folder structure:
 
-An example
-----------
+```
+~ spec
+  ~ fixtures
+    ~ get_user
+      - single_user.xml
+      - multiple_users.xml
+  + models
+  + controllers
+  + helpers
+  + views
+```
 
-user.rb
+When used inside a Rails 3 application, Savon::Spec uses `Rails.root.join("spec", "fixtures")` to locate your fixture directory.  
+In any other case, you have to manually set the fixture path via:
 
-    class User
+``` ruby
+Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
+```
 
-      def self.all
-        response = client.request :get_all_users
-        response.to_hash.map { |user_hash| new user_hash }
-      end
+Directory names inside the fixtures directory map to SOAP actions and contain actual SOAP responses from your service(s).  
+You can use one of those fixtures for the HTTP response body like in the following example:
 
-      def self.find(user_id)
-        response = client.request :get_user do
-          soap.body = { :id => user_id }
-        end
-        
-        new response.to_hash
-      end
+``` ruby
+savon.expects(:get_user).with(:id => 1).returns(:single_user)
+```
 
-    end
+As you can see, Savon::Spec uses the name of your SOAP action and the Symbol passed to the `#returns` method to navigate inside  
+your fixtures directory and load the requested XML files.
 
-user_spec.rb
 
-    describe User do
+Never
+-----
 
-      describe ".all" do
-        before do
-          savon.expects(:get_all_users).returns(:multiple_users)
-        end
+Savon::Spec can also verify that a certain SOAP request was not executed:
 
-        it "should return an Array of Users" do
-          User.all.each { |user| user.should be_a(User) }
-        end
+``` ruby
+savon.expects(:get_user).never
+```
 
-        it "should return exactly 7 Users" do
-          User.all.should have(7).items
-        end
-      end
 
-      describe ".find" do
-        before do
-          savon.expects(:get_user).with(:id => 1).returns(:single_user)
-        end
+RSpec
+-----
 
-        it "should return a User for a given :id" do
-          User.find(1).should be_a(User)
-        end
-      end
+This library is optimized to work with RSpec, but it could be tweaked to work with any other testing library.  
+Savon::Spec installs an after filter to clear out its Savon hooks after each example.
 
-    end

data/Rakefile

@@ -1,39 +1,8 @@
-require "rake"
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-begin
-  require "yard"
-  
-  YARD::Rake::YardocTask.new do |t|
-    t.files = ["README.md", "lib/**/*.rb"]
-  end
-rescue LoadError
-  desc message = %{"gem install yard" to generate documentation}
-  task("yard") { abort message }
-end
-
-begin  
-  require "metric_fu"
-  
-  MetricFu::Configuration.run do |c|
-    c.metrics = [:churn, :flog, :flay, :reek, :roodi, :saikuro] # :rcov seems to be broken
-    c.graphs = [:flog, :flay, :reek, :roodi]
-    c.flay = { :dirs_to_flay => ["lib"], :minimum_score => 20 }
-    c.rcov[:rcov_opts] << "-Ilib -Ispec"
-  end
-rescue LoadError
-  desc message = %{"gem install metric_fu" to generate metrics}
-  task("metrics:all") { abort message }
-end
-
-begin
-  require "rspec/core/rake_task"
-  
-  RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(-fd -c)
-  end
-rescue LoadError
-  desc message = %{"gem install rspec" to run the specs}
-  task(:spec) { abort message }
-end
+RSpec::Core::RakeTask.new
 
 task :default => :spec
+task :test => :spec
+

data/lib/savon/spec.rb

@@ -1,10 +1,16 @@
 require "savon"
 require "rspec"
-require "mocha"
 
-RSpec.configure do |config|
-  config.mock_with :mocha
+module Savon
+  module Spec
+
+    autoload :Macros,  "savon/spec/macros"
+    autoload :Mock,    "savon/spec/mock"
+    autoload :Fixture, "savon/spec/fixture"
+
+  end
 end
 
-require "savon/spec/version"
-require "savon/spec/macros"
+RSpec.configure do |config|
+  config.after { Savon.config.hooks.reject!(Savon::Spec::Mock::HOOKS) }
+end

data/lib/savon/spec/fixture.rb

@@ -3,13 +3,13 @@ module Savon
 
     # = Savon::Spec::Fixture
     #
-    # Loads SOAP response fixtures.
+    # Manages SOAP response fixtures.
     class Fixture
       class << self
 
         def path
           @path ||= Rails.root.join("spec", "fixtures").to_s if defined? Rails
-          
+
           raise ArgumentError, "Savon::Spec::Fixture.path needs to be specified" unless @path
           @path
         end
@@ -18,7 +18,7 @@ module Savon
 
         def load(*args)
           file = args.map { |arg| arg.to_s.snakecase }.join("/")
-          fixtures[file] ||= load_file file
+          fixtures[file] ||= read_file(file)
         end
 
         alias [] load
@@ -29,10 +29,10 @@ module Savon
           @fixtures ||= {}
         end
 
-        def load_file(file)
+        def read_file(file)
           full_path = File.expand_path File.join(path, "#{file}.xml")
           raise ArgumentError, "Unable to load: #{full_path}" unless File.exist? full_path
-          
+
           File.read full_path
         end
 

data/lib/savon/spec/macros.rb

@@ -1,15 +1,13 @@
-require "savon/spec/mock"
-
 module Savon
   module Spec
 
     # = Savon::Spec::Macros
     #
-    # Include this module into your RSpec tests to mock/stub Savon SOAP requests.
+    # Include this module into your RSpec tests to mock Savon SOAP requests.
     module Macros
 
       def savon
-        Savon::Spec::Mock.new
+        Mock.new
       end
 
     end

data/lib/savon/spec/mock.rb

@@ -1,77 +1,98 @@
-require "savon/spec/fixture"
-
 module Savon
   module Spec
 
+    class ExpectationError < RuntimeError; end
+
     # = Savon::Spec::Mock
     #
-    # Mocks/stubs SOAP requests executed by Savon.
+    # Mocks Savon SOAP requests.
     class Mock
 
-      # Mocks SOAP requests to a given <tt>soap_action</tt>.
-      def expects(soap_action)
-        setup :expects, soap_action
-        self
-      end
+      # Hooks registered by Savon::Spec.
+      HOOKS = [:spec_action, :spec_body, :spec_response, :spec_never]
 
-      # Stubs SOAP requests to a given <tt>soap_action</tt>.
-      def stubs(soap_action)
-        setup :stubs, soap_action
-        self
-      end
+      # Expects that a given +action+ should be called.
+      def expects(expected)
+        self.action = expected
+
+        Savon.config.hooks.define(:spec_action, :soap_request) do |request|
+          actual = request.soap.input[1]
+          raise ExpectationError, "expected #{action.inspect} to be called, got: #{actual.inspect}" unless actual == action
+
+          respond_with
+        end
 
-      # Expects a given SOAP body Hash to be used.
-      def with(soap_body)
-        Savon::SOAP::XML.any_instance.expects(:body=).with(soap_body) if mock_method == :expects
         self
       end
 
-      def never
-        httpi_mock.never
+      # Accepts a SOAP +body+ to check if it was set. Also accepts a +block+
+      # which receives the <tt>Savon::SOAP::Request</tt> to set up custom expectations.
+      def with(body = nil, &block)
+        Savon.config.hooks.define(:spec_body, :soap_request) do |request|
+          if block
+            block.call(request)
+          else
+            actual = request.soap.body
+            raise ExpectationError, "expected #{body.inspect} to be sent, got: #{actual.inspect}" unless actual == body
+          end
+
+          respond_with
+        end
+
         self
       end
 
-      # Sets up HTTPI to return a given +response+.
+      # Expects a given +response+ to be returned.
       def returns(response = nil)
-        http = { :code => 200, :headers => {}, :body => "" }
-        
-        case response
-          when Symbol   then http[:body] = Fixture[soap_action, response]
-          when Hash     then http.merge! response
-          when String   then http[:body] = response
+        http = case response
+          when Symbol then { :body => Fixture[action, response] }
+          when Hash   then response
         end
-        
-        httpi_mock.returns HTTPI::Response.new(http[:code], http[:headers], http[:body])
+
+        Savon.config.hooks.define(:spec_response, :soap_request) do |request|
+          respond_with(http)
+        end
+
         self
       end
 
-      # Sets up Savon to respond like there was a SOAP fault.
-      def raises_soap_fault
-        Savon::SOAP::Response.any_instance.expects(:soap_fault?).returns(true)
+      # Expects that the +action+ doesn't get called.
+      def never
+        Savon.config.hooks.reject!(:spec_action)
+
+        Savon.config.hooks.define(:spec_never, :soap_request) do |request|
+          actual = request.soap.input[1]
+          raise ExpectationError, "expected #{action.inspect} never to be called, but it was!" if actual == action
+
+          respond_with
+        end
+
         self
       end
 
     private
 
-      def setup(mock_method, soap_action)
-        self.mock_method = mock_method
-        self.soap_action = soap_action
-        self.httpi_mock = new_httpi_mock
+      def action=(action)
+        @action = lower_camelcase(action.to_s).to_sym
       end
 
-      attr_accessor :mock_method
+      attr_reader :action
 
-      def soap_action=(soap_action)
-        @soap_action = soap_action.kind_of?(Symbol) ? soap_action.to_s.lower_camelcase : soap_action
-      end
+      def respond_with(http = {})
+        defaults = { :code => 200, :headers => {}, :body => "" }
+        http = defaults.merge(http)
 
-      attr_reader :soap_action
-
-      def new_httpi_mock
-        HTTPI.send(mock_method, :post).with { |http| http.body =~ /<\/(.+:)?#{soap_action}>/ }
+        HTTPI::Response.new(http[:code], http[:headers], http[:body])
       end
 
-      attr_accessor :httpi_mock
+      # Extracted from CoreExt of Savon 0.9.9
+      def lower_camelcase(source_str)
+        str = source_str.dup
+        str.gsub!(/\/(.?)/) { "::#{$1.upcase}" }
+        str.gsub!(/(?:_+|-+)([a-z])/) { $1.upcase }
+        str.gsub!(/(\A|\s)([A-Z])/) { $1 + $2.downcase }
+        str
+      end
 
     end
   end

data/lib/savon/spec/version.rb

@@ -1,7 +1,7 @@
 module Savon
   module Spec
 
-    VERSION = "0.1.6"
+    VERSION = "1.1.0"
 
   end
 end

data/lib/savon_spec.rb

@@ -1 +1,2 @@
 require "savon/spec"
+require "savon/spec/version"

data/savon_spec.gemspec

@@ -1,25 +1,27 @@
-lib = File.expand_path("../lib/", __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 require "savon/spec/version"
 
 Gem::Specification.new do |s|
-  s.name = "savon_spec"
-  s.version = Savon::Spec::VERSION
-  s.authors = "Daniel Harrington"
-  s.email = "me@rubiii.com"
-  s.homepage = "http://github.com/rubiii/#{s.name}"
-  s.summary = "Savon testing library"
-  s.description = "Test helpers for the Savon SOAP library."
+  s.name        = "savon_spec"
+  s.version     = Savon::Spec::VERSION
+  s.authors     = "Daniel Harrington"
+  s.email       = "me@rubiii.com"
+  s.homepage    = "http://github.com/rubiii/#{s.name}"
+  s.summary     = "Savon testing library"
+  s.description = s.summary
 
   s.rubyforge_project = s.name
 
-  s.add_dependency "savon", ">= 0.8.0"
+  s.add_dependency "savon", "~> 0.9.10"
   s.add_dependency "rspec", ">= 2.0.0"
-  s.add_dependency "mocha", ">= 0.9.8"
 
   s.add_development_dependency "httpclient", "~> 2.1.5"
-  s.add_development_dependency "webmock", "~> 1.4.0"
+  s.add_development_dependency "webmock",    "~> 1.4.0"
+
+  s.add_development_dependency "autotest"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "ZenTest", "4.5.0"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/spec/fixtures/get_user/success.xml

@@ -2,8 +2,8 @@
    <soap:Body>
       <ns2:getUserResponse xmlns:ns2="http://users.example.com/">
          <return>
-           <name>Kent</name>
-           <email>kent@example.com</email>
+           <name>Dr. Who</name>
+           <email>dr_who@example.com</email>
          </return>
       </ns2:getUserResponse>
    </soap:Body>

data/spec/savon/spec/fixture_spec.rb

@@ -3,43 +3,50 @@ require "spec_helper"
 describe Savon::Spec::Fixture do
 
   describe ".path" do
-    it "should return a specified path" do
-      Savon::Spec::Fixture.path = "/Users/rubiii/my_app/spec/fixtures"
-      Savon::Spec::Fixture.path.should == "/Users/rubiii/my_app/spec/fixtures"
-      
+
+    it "returns a specified path" do
+      Savon::Spec::Fixture.path = "/Users/dr_who/some_app/spec/fixtures"
+      Savon::Spec::Fixture.path.should == "/Users/dr_who/some_app/spec/fixtures"
+
       Savon::Spec::Fixture.path = nil  # reset to default
     end
 
-    it "should raise an ArgumentError if accessed before specified" do
-      lambda { Savon::Spec::Fixture.path }.should raise_error(ArgumentError)
+    it "raises an ArgumentError when accessed before specified" do
+      expect { Savon::Spec::Fixture.path }.to raise_error(ArgumentError)
     end
 
-    it "should default to spec/fixtures if used in a Rails app" do
-      Rails = Class.new
-      Rails.expects(:root).returns(Pathname.new("/Users/rubiii/another_app"))
-      
-      Savon::Spec::Fixture.path.should == "/Users/rubiii/another_app/spec/fixtures"
-      
+    it "defaults to spec/fixtures when used in a Rails app" do
+      Rails = Class.new do
+        def self.root
+          Pathname.new("/Users/dr_who/another_app")
+        end
+      end
+
+      Savon::Spec::Fixture.path.should == "/Users/dr_who/another_app/spec/fixtures"
+
       Object.send(:remove_const, "Rails")
     end
+
   end
 
   describe ".load" do
+
     around do |example|
       Savon::Spec::Fixture.path = "spec/fixtures"
       example.run
       Savon::Spec::Fixture.path = nil  # reset to default
     end
 
-    it "should return a fixture for the given arguments" do
+    it "returns a fixture for the given arguments" do
       fixture = Savon::Spec::Fixture.load :get_user, :success
       fixture.should == File.read("spec/fixtures/get_user/success.xml")
     end
 
-    it "should memoize the fixtures" do
+    it "memoizes the fixtures" do
       Savon::Spec::Fixture.load(:get_user, :success).
         should equal(Savon::Spec::Fixture.load(:get_user, :success))
     end
+
   end
 
 end

data/spec/savon/spec/macros_spec.rb

@@ -4,7 +4,7 @@ describe Savon::Spec::Macros do
   include Savon::Spec::Macros
 
   describe "#savon" do
-    it "should return a Savon::Spec::Mock instance" do
+    it "returns a Savon::Spec::Mock instance" do
       savon.should be_a(Savon::Spec::Mock)
     end
   end

data/spec/savon/spec/mock_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
 
-Savon.configure do |config|
-  config.log = false
-end
-
 describe Savon::Spec::Mock do
   include Savon::Spec::Macros
 
-  let :client do
+  let(:client) do
     Savon::Client.new do
       wsdl.endpoint = "http://example.com"
       wsdl.namespace = "http://users.example.com"
@@ -15,125 +11,122 @@ describe Savon::Spec::Mock do
   end
 
   describe "#expects" do
-    before { savon.expects(:get_user).returns }
 
-    it "should set up HTTPI to mock POST requests for a given SOAP action" do
-      client.request :get_user
+    before do
+      savon.expects(:get_user)
     end
 
-    it "should fail when only parts of the SOAP action matched" do
-      expect { client.request :get_user_by_id }.to raise_error(
-        Mocha::ExpectationError,
-        /expected exactly once, not yet invoked: HTTPI.post/
-      )
-
-      teardown_mocks_for_rspec
+    it "does not execute a POST request (verified via WebMock)" do
+      client.request(:get_user)
     end
 
-    it "should fail when no SOAP call was made" do
-      expect { verify_mocks_for_rspec }.to raise_error(
-        Mocha::ExpectationError,
-        /expected exactly once, not yet invoked: HTTPI.post/
+    it "fails when a different SOAP action was called" do
+      expect { client.request(:get_user_by_id) }.to raise_error(
+        Savon::Spec::ExpectationError,
+        "expected :getUser to be called, got: :getUserById"
       )
-
-      teardown_mocks_for_rspec
     end
+
   end
 
-  describe "#expects and #with" do
-    before { savon.expects(:get_user).with(:id => 1).returns }
+  describe "#with" do
+
+    context "a Hash" do
 
-    it "should expect Savon to send a given SOAP body" do
-      client.request :get_user do
-        soap.body = { :id => 1 }
+      before do
+        savon.expects(:get_user).with(:id => 1)
       end
-    end
 
-    it "should fail when the SOAP body was not send" do
-      client.request(:get_user)
+      it "expects Savon to send a specific SOAP body" do
+        client.request :get_user, :body => { :id => 1 }
+      end
 
-      expect { verify_mocks_for_rspec }.to raise_error(
-        Mocha::ExpectationError,
-        /expected exactly once, not yet invoked: #<AnyInstance:Savon::SOAP::XML>.body=\(:id => 1\)/
-      )
+      it "fails when the SOAP body was not set" do
+        expect { client.request(:get_user) }.to raise_error(
+          Savon::Spec::ExpectationError,
+          "expected {:id=>1} to be sent, got: nil"
+        )
+      end
+
+      it "fails when the SOAP body did not match the expected value" do
+        expect { client.request :get_user, :body => { :id => 2 } }.to raise_error(
+          Savon::Spec::ExpectationError,
+          "expected {:id=>1} to be sent, got: {:id=>2}"
+        )
+      end
 
-      teardown_mocks_for_rspec
     end
-  end
 
-  describe "#expects and #never" do
-    before { savon.expects(:noop).never }
+    context "a block" do
 
-    it "should not expect Savon to send a given SOAP body" do
-      expect { client.request(:noop) }.to raise_error(
-        Mocha::ExpectationError,
-        /expected never, invoked once: HTTPI.post()/
-      )
+      before do
+        savon.expects(:get_user).with do |request|
+          request.soap.body.should include(:id)
+        end
+      end
 
-      teardown_mocks_for_rspec
-    end
-  end
+      it "works with a custom expectation" do
+        client.request :get_user, :body => { :id => 1 }
+      end
 
-  describe "#stubs" do
-    before { savon.stubs(:get_user).returns }
+      it "fails when the expectation was not met" do
+        begin
+          client.request :get_user, :body => { :name => "Dr. Who" }
+        rescue Spec::Expectations::ExpectationNotMetError => e
+          e.message.should =~ /expected \{:name=>"Dr. Who"\} to include :id/
+        end
+      end
 
-    it "should set up HTTPI to stub POST requests for a given SOAP action" do
-      client.request :get_user
     end
 
-    it "should not complain about requests not being executed" do
-      expect { verify_mocks_for_rspec }.to_not raise_error(Mocha::ExpectationError)
-      teardown_mocks_for_rspec
-    end
   end
 
-  describe "#stubs and #with" do
-    before { savon.stubs(:get_user).with(:id => 1).returns }
+  describe "#never" do
 
-    it "should not expect Savon to send a given SOAP body" do
-      client.request :get_user
+    before do
+      savon.expects(:noop).never
     end
+
+    it "expects Savon to never call a specific SOAP action" do
+      expect { client.request(:noop) }.to raise_error(
+        Savon::Spec::ExpectationError,
+        "expected :noop never to be called, but it was!"
+      )
+    end
+
   end
 
   describe "#returns" do
-    context "without arguments" do
-      let(:response) { client.request :get_user }
-
-      before { savon.expects(:get_user).returns }
 
-      it "should return a response code of 200" do
-        response.http.code.should == 200
-      end
+    context "without arguments" do
 
-      it "should not return any response headers" do
-        response.http.headers.should == {}
+      let(:response) do
+        client.request(:get_user)
       end
 
-      it "should return an empty response body" do
-        response.http.body.should == ""
+      before do
+        savon.expects(:get_user)
       end
-    end
 
-    context "with a String" do
-      let(:response) { client.request :get_user }
-
-      before { savon.expects(:get_user).returns("<soap>response</soap>") }
-
-      it "should return a response code of 200" do
+      it "returns a response code of 200" do
         response.http.code.should == 200
       end
 
-      it "should not return any response headers" do
+      it "does not return any response headers" do
         response.http.headers.should == {}
       end
 
-      it "should return the given response body" do
-        response.http.body.should == "<soap>response</soap>"
+      it "returns an empty response body" do
+        response.http.body.should == ""
       end
+
     end
 
     context "with a Symbol" do
-      let(:response) { client.request :get_user }
+
+      let(:response) do
+        client.request(:get_user)
+      end
 
       around do |example|
         Savon::Spec::Fixture.path = "spec/fixtures"
@@ -144,56 +137,48 @@ describe Savon::Spec::Mock do
         Savon::Spec::Fixture.path = nil  # reset to default
       end
 
-      it "should return a response code of 200" do
+      it "returns a response code of 200" do
         response.http.code.should == 200
       end
 
-      it "should not return any response headers" do
+      it "does not return any response headers" do
         response.http.headers.should == {}
       end
 
-      it "should return the :success fixture for the :get_user action" do
+      it "returns the :success fixture for the :get_user action" do
         response.http.body.should == File.read("spec/fixtures/get_user/success.xml")
       end
+
     end
 
     context "with a Hash" do
-      let(:response) { client.request :get_user }
 
-      before do
-        @hash = { :code => 201, :headers => { "Set-Cookie" => "ID=1; Max-Age=3600;" }, :body => "<with>cookie</with>" }
-        savon.expects(:get_user).returns(@hash)
+      let(:response) do
+        client.request(:get_user)
       end
 
-      it "should return the given response code" do
-        response.http.code.should == @hash[:code]
+      let(:http) do
+        { :code => 201, :headers => { "Set-Cookie" => "ID=1; Max-Age=3600;" }, :body => "<with>cookie</with>" }
       end
 
-      it "should return the given response headers" do
-        response.http.headers.should == @hash[:headers]
+      before do
+        savon.expects(:get_user).returns(http)
       end
 
-      it "should return the given response body" do
-        response.http.body.should == @hash[:body]
+      it "returns the given response code" do
+        response.http.code.should == http[:code]
       end
-    end
-  end
-
-  describe "#with_soap_fault" do
-    before { savon.expects(:get_user).raises_soap_fault.returns }
-
-    it "should raise a SOAP fault" do
-      expect { client.request :get_user }.to raise_error(Savon::SOAP::Fault)
-    end
 
-    it "should just act like there was a SOAP fault if raising errors was disabled" do
-      Savon.raise_errors = false
+      it "returns the given response headers" do
+        response.http.headers.should == http[:headers]
+      end
 
-      response = client.request :get_user
-      response.should be_a_soap_fault
+      it "returns the given response body" do
+        response.http.body.should == http[:body]
+      end
 
-      Savon.raise_errors = true  # reset to default
     end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon_spec
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
-  - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,29 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +02:00
-default_executable: 
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: savon
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 47
         segments: 
         - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 9
+        - 10
+        version: 0.9.10
+  name: savon
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,28 +45,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  name: rspec
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: httpclient
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +61,12 @@ dependencies:
         - 1
         - 5
         version: 2.1.5
+  name: httpclient
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,9 +77,55 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
+  name: webmock
   type: :development
-  version_requirements: *id005
-description: Test helpers for the Savon SOAP library.
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: autotest
+  type: :development
+  prerelease: false
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  type: :development
+  prerelease: false
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 5
+        - 0
+        version: 4.5.0
+  name: ZenTest
+  type: :development
+  prerelease: false
+  requirement: *id007
+description: Savon testing library
 email: me@rubiii.com
 executables: []
 
@@ -109,6 +136,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -124,7 +152,6 @@ files:
 - spec/savon/spec/macros_spec.rb
 - spec/savon/spec/mock_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rubiii/savon_spec
 licenses: []
 
@@ -154,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: savon_spec
-rubygems_version: 1.4.1
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Savon testing library