fakettp 0.3.6 → 0.3.7

data/README.rdoc

@@ -146,6 +146,8 @@ was received, to assist debugging.
 Point your browser at http://fakettp.local/
 
 Currently this is very basic, just showing the expectations from the last run.
+Expectations are colour-coded according to status, and any error messages are
+shown.
 
 === Multiple faked hosts
 
@@ -157,6 +159,11 @@ _ServerAlias_ entry to the virtual host config, under the _ServerName_ line, eg:
 
 == Change log
 
+0.3.7 (19 November 2009)
+
+* Show error messages in console.
+* Use nokogiri instead of hpricot for testing.
+
 0.3.6 (3 November 2009)
 
 * Properly include rspec as a *runtime* dependency.

data/Rakefile

@@ -23,6 +23,7 @@ begin
     gem.add_development_dependency 'rcov'
     gem.add_development_dependency 'rack-test'
     gem.add_development_dependency 'cucumber'
+    gem.add_development_dependency 'nokogiri'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/features/control.feature

@@ -2,11 +2,11 @@ Feature: Controlling the simulator
   Scenario: Attempting to reset the simulator using the wrong host
     When we post to /reset on foo.fakettp.fake.local
     Then the response body should contain 'Simulator received mismatched request'
-    
+
   Scenario: Attempting to create an expectation using the wrong host
     When we post to /expect on foo.fakettp.fake.local
     Then the response body should contain 'Simulator received mismatched request'
-    
+
   Scenario: Attempting to verify the simulator using the wrong host
     When we get /verify on foo.fakettp.fake.local
     Then the response body should contain 'Simulator received mismatched request'

data/features/dashboard.feature

@@ -9,26 +9,49 @@ Feature: Dashboard for debugging failures
     And there are 3 expectations
     When we get / on fakettp.local
     Then there should be 3 /html/body/div elements in the response
-    
+
   Scenario: Show expectation heading and contents
     Given the simulator is reset
     And we expect get_root
     When we get / on fakettp.local
     Then //h1[1] in the response should be '1'
-    And //div[1]/pre in the response should be:
+    And //div[1]/div/pre in the response should be:
       """
       expect "GET /" do
         request.path_info.should == '/'
       end
       """
 
+  Scenario: Show expectation status
+    Given the simulator is reset
+    And we expect get_root
+    And we expect get_root
+    And we expect get_root
+    And we get / on foo.fakettp.fake.local
+    And we get /foo on foo.fakettp.fake.local
+    When we get / on fakettp.local
+    Then //body/div[1]/@class in the response should be 'request pass'
+    Then //body/div[2]/@class in the response should be 'request fail'
+    Then //body/div[3]/@class in the response should be 'request pending'
+
+  Scenario: Show error message for failed expectation
+    Given the simulator is reset
+    And we expect get_root
+    And we get /foo on foo.fakettp.fake.local
+    When we get / on fakettp.local
+    Then //body/div/div[@class='error']/pre in the response should be:
+      """
+      Error in GET /: expected: "/",
+           got: "/foo" (using ==)
+      """
+
   @wip
   Scenario: Highlight passed and failed lines
     Given the simulator is reset
     And we expect pass_and_fail
     And we get / on foo.fakettp.fake.local
     When we get / on fakettp.local
-    Then //div[1]/pre in the response should be:
+    Then //div/div[@class='expectation']/pre in the response should be:
       """
       <span class="pass">expect "pass and fail" do
         (2 + 2).should == 4</span>

data/features/expectations.feature

@@ -4,21 +4,21 @@ Feature: Expectations
     And we expect expect_get
     And we get / on foo.fakettp.fake.local
     Then verifying the simulator should report success
-    
+
   Scenario: Setting response headers
     Given the simulator is reset
     And we expect set_response
     And we get / on foo.fakettp.fake.local
     Then the response should have a 'foo' header with a value of 'bar'
     And verifying the simulator should report success
-    
+
   Scenario: Setting response content-type
     Given the simulator is reset
     And we expect set_response
     And we get / on foo.fakettp.fake.local
     Then the response should have a content type of 'application/xml'
     And verifying the simulator should report success
-    
+
   Scenario: Setting response code
     Given the simulator is reset
     And we expect set_response

data/features/step_definitions/http.rb

@@ -1,28 +1,47 @@
-require 'hpricot'
+require 'nokogiri'
+
+module HttpHelper
+  def check_value locator, value
+    node = Nokogiri::XML(@response.body).xpath(locator).first
+    contents = case node
+               when Nokogiri::XML::Element then node.inner_html
+               when Nokogiri::XML::Attr then node.to_s
+               when nil then ''
+               else raise 'Unexpected node type'
+               end
+    contents.should == value
+  end
+end
+World HttpHelper
 
 When /^we get (\S*) on (\S*)$/ do |path, host|
   req = Net::HTTP::Get.new path
-  @@response = Net::HTTP.new(host).start {|http| http.request(req) }
+  @response = Net::HTTP.new(host).start {|http| http.request(req) }
 end
+
 When /^we post to (\S*) on (\S*)$/ do |path, host|
   req = Net::HTTP::Post.new path
-  @@response = Net::HTTP.new(host).start {|http| http.request(req) }
+  @response = Net::HTTP.new(host).start {|http| http.request(req) }
+end
+
+When /^we print the response$/ do
+  puts @response
 end
 
 Then /^the response should have a '(.*)' header with a value of '(.*)'$/ do |name, value|
-  @@response[name].should == value
+  @response[name].should == value
 end
 
 Then /^the response should have a content type of '(.*)'$/ do |value|
-  @@response.content_type.should == value
+  @response.content_type.should == value
 end
 
 Then /^the response body should be '(.*)'$/ do |value|
-  @@response.body.should == value
+  @response.body.should == value
 end
 
 Then /^the response body should contain '(.*)'$/ do |value|
-  @@response.body.should include(value)
+  @response.body.should include(value)
 end
 
 Then /^(\S*) in the response should be '(.*)'$/ do |locator, value|
@@ -33,10 +52,6 @@ Then /^(\S*) in the response should be:$/ do |locator, value|
   check_value locator, value
 end
 
-def check_value locator, value
-  (Hpricot(@@response.body)/locator).inner_html.should == value
-end
-
 Then /^there should be (\d*) (.*) elements in the response$/ do |count, locator|
-  Hpricot(@@response.body).search(locator).size.should == count.to_i
-end
+  Nokogiri::XML(@response.body).xpath(locator).size.should == count.to_i
+end

data/features/step_definitions/webrat_steps.rb

@@ -16,20 +16,20 @@ When /^I follow "(.*)"$/ do |link|
 end
 
 When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
-  fill_in(field, :with => value) 
+  fill_in(field, :with => value)
 end
 
 When /^I select "(.*)" from "(.*)"$/ do |value, field|
-  select(value, :from => field) 
+  select(value, :from => field)
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:
-# When I select "December 25, 2008 10:00" as the date and time 
+# When I select "December 25, 2008 10:00" as the date and time
 When /^I select "(.*)" as the date and time$/ do |time|
   select_datetime(time)
 end
 
-# Use this step when using multiple datetime_select helpers on a page or 
+# Use this step when using multiple datetime_select helpers on a page or
 # you want to specify which datetime to select. Given the following view:
 #   <%= f.label :preferred %><br />
 #   <%= f.datetime_select :preferred %>
@@ -45,7 +45,7 @@ end
 # Use this step in conjuction with Rail's time_select helper. For example:
 # When I select "2:20PM" as the time
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it. 
+# will convert the 2:20PM to 14:20 and then select it.
 When /^I select "(.*)" as the time$/ do |time|
   select_time(time)
 end
@@ -71,11 +71,11 @@ When /^I select "(.*)" as the "(.*)" date$/ do |date, date_label|
 end
 
 When /^I check "(.*)"$/ do |field|
-  check(field) 
+  check(field)
 end
 
 When /^I uncheck "(.*)"$/ do |field|
-  uncheck(field) 
+  uncheck(field)
 end
 
 When /^I choose "(.*)"$/ do |field|

data/features/support/paths.rb

@@ -1,12 +1,12 @@
 def path_to(page_name)
   case page_name
-  
+
   when /the homepage/i
     root_path
-  
+
   # Add more page name => path mappings here
-  
+
   else
     raise "Can't find mapping from \"#{page_name}\" to a path."
   end
-end
+end

data/lib/fakettp/commands/fakettp_command.rb

@@ -4,7 +4,7 @@ module Fakettp
       def initialize args
         @args = args
       end
-  
+
       def run
         command = @args[0]
         return usage unless command
@@ -15,9 +15,9 @@ module Fakettp
           return usage
         end
       end
-  
+
       private
-      
+
       def install
         @directory, @hostname = @args[1..2]
         return usage unless @directory && @hostname
@@ -30,7 +30,7 @@ module Fakettp
         create_database
         return 0
       end
-  
+
       def copy_files
         FileUtils.mkdir_p @directory + '/tmp', :mode => 0777
         FileUtils.mkdir_p @directory + '/public'

data/lib/fakettp/config.ru

@@ -1,14 +1,14 @@
 require 'rubygems'
 require 'sinatra'
- 
+
 Sinatra::Default.set :run, false
 Sinatra::Default.set :environment, :production
 Sinatra::Default.set :raise_errors, true
- 
+
 log = File.new("fakettp.log", "a")
 STDOUT.reopen(log)
 STDERR.reopen(log)
- 
+
 FAKETTP_BASE = File.expand_path(File.dirname(__FILE__))
 require 'fakettp'
 

data/lib/fakettp/error.rb

@@ -1,7 +1,7 @@
 module Fakettp
   class Error < ActiveRecord::Base
     belongs_to :expectation
-        
+
     def self.list
       errors = Error.all
       return '' if errors.empty?

data/lib/fakettp/expectation.rb

@@ -3,8 +3,9 @@ require 'fakettp/db'
 module Fakettp
   class Expectation < ActiveRecord::Base
     set_table_name :expectations
+    # TODO Why has_many? There can be only one!
     has_many :errors
-    
+
     class Error < StandardError
       attr_reader :line_number
       def initialize message, line_number = nil
@@ -12,27 +13,26 @@ module Fakettp
         super(message)
       end
     end
-            
-    def render
-      if executed
-        span_class = errors.empty? ? 'pass' : 'fail'
-        %(<span class="#{span_class}">#{contents}</span>)
-      else
-        contents
-      end
-    end
-    
+
     def execute binding
       self.executed = true
       save
       eval contents, binding
       # TODO: Include context of expectation file
     end
-        
+
+    def status
+      if executed
+        errors.empty? ? 'pass' : 'fail'
+      else
+        'pending'
+      end
+    end
+
     def self.all_received?
       !exists? :executed => false
     end
-    
+
     def self.next
       find_by_executed(false)
     end

data/lib/fakettp/expectation_helper.rb

@@ -5,7 +5,7 @@ module Fakettp
     def self.included(cls)
       cls.send :include, Spec::Matchers
     end
-  
+
     def expect label
       begin
         yield

data/lib/fakettp/public/fakettp.css

@@ -3,12 +3,37 @@ body {
     "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans",
     "Liberation Sans", Verdana, sans-serif;
 }
+div.request {
+  margin-bottom: 10px;
+}
 div.expectation {
   width: 95%;
   border: 1px solid #888;
+  border-top: none;
   background-color: #eee;
-  margin: 0 auto 10px auto;
+  margin: 0 auto 0 auto;
+  padding: 5px;
+}
+div.error {
+  width: 95%;
+  border: 1px solid #f00;
+  border-top: none;
+  background-color: #fdd;
+  margin: 0 auto 0 auto;
   padding: 5px;
+  color: #f00;
+}
+.pass h1 {
+  background-color: #0a0;
+}
+.fail h1 {
+  background-color: #f00;
+}
+.pass h1, .pass div {
+  border-color: #0a0;
+}
+.fail h1, .fail div {
+  border-color: #f00;
 }
 h1 {
   width: 95%;
@@ -19,15 +44,22 @@ h1 {
   font-size: 110%;
   color: #fff;
 }
-.expectation pre {
+.expectation pre, .error pre {
   padding: 0;
   margin: 0;
   font: 75% Monaco, "Bitstream Vera Sans Mono", "Lucida Console",
-    Terminal, monospace;        
+    Terminal, monospace;
+}
+div.pass {
+  border-color: #0a0;
+}
+div.fail {
+  border-color: #f00;
 }
-.pass {
+span.pass {
   color: #0a0;
 }
-.fail {
+span.fail {
   color: #f00;
 }
+

data/lib/fakettp/simulator.rb

@@ -2,21 +2,21 @@ require 'fakettp/expectation'
 require 'fakettp/error'
 
 module Fakettp
-  class Simulator    
+  class Simulator
     def self.reset
       Expectation.delete_all
       Error.delete_all
     end
-    
+
     def self.verify
       Error.create!(:message => 'Expected request not received') unless Expectation.all_received?
       return !Error.exists?
     end
-    
+
     def self.<< expectation
       Expectation.create! :contents => expectation
     end
-    
+
     def self.handle_request binding
       expectation = Expectation.next
       if expectation
@@ -31,9 +31,9 @@ module Fakettp
         raise Expectation::Error.new('Received unexpected request')
       end
     end
-    
+
     def self.list_errors
       Error.list
     end
   end
-end
+end

data/lib/fakettp/views/index.erb

@@ -5,9 +5,16 @@
   </head>
   <body>
     <% @expectations.each_with_index do |expectation, index| %>
-      <h1><%= index + 1 %></h1>
-      <div class="expectation">
-        <pre><%= expectation.render %></pre>
+      <div class="request <%= expectation.status %>">
+        <h1><%= index + 1 %></h1>
+        <div class="expectation">
+          <pre><%= expectation.contents %></pre>
+        </div>
+        <% unless expectation.errors.empty? %>
+          <div class="error">
+            <pre><%= expectation.errors.first.message %></pre>
+          </div>
+        <% end %>
       </div>
     <% end %>
   </body>

data/spec/fakettp/controller_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'hpricot'
+require 'nokogiri'
 
 describe 'Controller' do
   include Rack::Test::Methods
@@ -7,7 +7,7 @@ describe 'Controller' do
   def app
     Sinatra::Application
   end
-  
+
   before :all do
     @host = YAML.load(File.read(FAKETTP_BASE + '/fakettp.yml'))['hostname']
   end
@@ -15,11 +15,11 @@ describe 'Controller' do
   before do
     Fakettp::Simulator.reset
   end
-  
+
   it 'mixes in Fakettp::ExpectationHelper' do
     Sinatra::Application.included_modules.should include(Fakettp::ExpectationHelper)
   end
-  
+
   describe 'posting to /reset' do
     before do
       Fakettp::Simulator.stub! :reset
@@ -50,7 +50,7 @@ describe 'Controller' do
         last_response.body.should == "Reset OK\n"
       end
     end
-    
+
     describe 'on another host' do
       it 'acts like any other simulated request' do
         post '/reset', nil, 'HTTP_HOST' => 'foo.fake.local'
@@ -90,7 +90,7 @@ describe 'Controller' do
         last_response.body.should == "Expect OK\n"
       end
     end
-    
+
     describe 'on another host' do
       it 'acts like any other simulated request' do
         post '/expect', @body, 'HTTP_HOST' => 'foo.fake.local'
@@ -195,7 +195,7 @@ describe 'Controller' do
         end
       end
     end
-    
+
     describe 'on another host' do
       it 'acts like any other simulated request' do
         get '/verify', nil, 'HTTP_HOST' => 'foo.fake.local'
@@ -207,44 +207,70 @@ describe 'Controller' do
   describe 'getting /' do
     describe 'on the fakettp host' do
       before do
-        expectation_1 = stub :expectation, :id => 1, :render => 'foo'
-        expectation_2 = stub :expectation, :id => 2, :render => 'bar'
-        Fakettp::Expectation.stub!(:all).and_return [expectation_1, expectation_2]
+        error = Fakettp::Error.new :message => 'Oh noes!'
+        expectation_1 = stub :expectation, :id => 1, :status => 'pass', :contents => 'foo', :errors => []
+        expectation_2 = stub :expectation, :id => 2, :status => 'fail', :contents => 'bar', :errors => [error]
+        expectation_3 = stub :expectation, :id => 3, :status => 'pending', :contents => 'baz', :errors => []
+        Fakettp::Expectation.stub!(:all).and_return [expectation_1, expectation_2, expectation_3]
       end
-      
+
       def do_get
         get '/', nil, 'HTTP_HOST' => @host
-        @response_doc = Hpricot(last_response.body)
+        @response_doc = Nokogiri::XML(last_response.body)
       end
 
       it 'returns an html response' do
         do_get
         last_response.content_type.should == 'text/html'
       end
-      
+
       it 'sets the title' do
         do_get
         (@response_doc/'head/title').inner_html.should == 'FakeTTP'
       end
-      
+
       it 'renders a div for each expectation' do
         do_get
-        @response_doc.search("//div[@class='expectation']").size.should == 2
+        @response_doc.search("//div[@class='expectation']").size.should == 3
       end
-      
+
       it 'numbers the expectations' do
         do_get
-        (@response_doc/"//h1[1]").inner_html.should == '1'
-        (@response_doc/"//h1[2]").inner_html.should == '2'
+        (@response_doc/"//div/h1").map(&:inner_html).should == %w(1 2 3)
       end
-      
+
       it 'displays the expectation contents' do
         do_get
-        (@response_doc/"//div[@class='expectation'][1]/pre").inner_html.should == 'foo'
-        (@response_doc/"//div[@class='expectation'][2]/pre").inner_html.should == 'bar'
+        (@response_doc/"//div[@class='expectation']/pre").map(&:inner_html).should == %w(foo bar baz)
+      end
+
+      describe 'for passed expectations' do
+        it "sets the request div class to 'request pass'" do
+          do_get
+          (@response_doc/"//body/div[1]/@class").to_s.should == 'request pass'
+        end
+      end
+
+      describe 'for failed expectations' do
+        it "sets the request div class to 'request fail'" do
+          do_get
+          (@response_doc/"//body/div[2]/@class").to_s.should == 'request fail'
+        end
+
+        it 'renders the error message' do
+          do_get
+          (@response_doc/"//body/div[2]/div[@class='error']/pre").inner_html.should == 'Oh noes!'
+        end
+      end
+
+      describe 'for pending expectations' do
+        it "sets the request div class to 'request pending'" do
+          do_get
+          (@response_doc/"//body/div[3]/@class").to_s.should == 'request pending'
+        end
       end
     end
-    
+
     describe 'on another host' do
       it 'acts like any other simulated request' do
         get '/', nil, 'HTTP_HOST' => 'foo.fake.local'

data/spec/fakettp/error_spec.rb

@@ -4,34 +4,34 @@ describe Fakettp::Error do
   before do
     Fakettp::Error.delete_all
   end
-  
+
   it 'is an ActiveRecord' do
     Fakettp::Error.new.should be_a_kind_of(ActiveRecord::Base)
   end
-  
+
   it { should have_db_column(:message).of_type(:text) }
 
   it { should have_db_column(:line_number).of_type(:integer) }
-  
+
   it { should belong_to(:expectation) }
-  
+
   describe 'listing errors' do
     describe 'when errors exist' do
       before do
         Fakettp::Error.create! :message => 'foo'
         Fakettp::Error.create! :message => 'bar'
       end
-      
+
       it 'returns the concatenated error messages' do
         Fakettp::Error.list.should == "foo\nbar\n"
       end
     end
-    
+
     describe 'when no errors exist' do
       before do
         Fakettp::Error.delete_all
       end
-      
+
       it 'returns an empty string' do
         Fakettp::Error.list.should == ''
       end

data/spec/fakettp/expectation_helper_spec.rb

@@ -5,10 +5,10 @@ describe Fakettp::ExpectationHelper do
     class Foo
       include Fakettp::ExpectationHelper
     end
-    
+
     Foo.included_modules.should include(Spec::Matchers)
   end
-  
+
   describe 'calling expect' do
     describe 'when a matcher exception occurs' do
       it 'raises an exception' do
@@ -20,7 +20,7 @@ describe Fakettp::ExpectationHelper do
             /Error in foo: expected: 2,\s*got: 1/)
       end
     end
-    
+
     describe 'when the block returns a value' do
       it 'returns the value' do
         result = Fakettp::ExpectationHelper.expect 'foo' do

data/spec/fakettp/expectation_spec.rb

@@ -4,27 +4,27 @@ describe Fakettp::Expectation do
   before do
     Fakettp::Expectation.delete_all
   end
-  
+
   it 'is an ActiveRecord' do
     Fakettp::Expectation.new.should be_a_kind_of(ActiveRecord::Base)
   end
-  
+
   it { should have_db_column(:contents).of_type(:text) }
 
   it { should have_db_column(:executed).of_type(:boolean) }
-  
+
   it { should have_many(:errors) }
-    
+
   it 'starts out unexecuted' do
     Fakettp::Expectation.create.executed.should be_false
   end
-  
+
   describe 'checking whether all expected requests have been received' do
     describe 'when there are no expectations' do
       before do
         Fakettp::Expectation.delete_all
       end
-      
+
       it 'returns true' do
         Fakettp::Expectation.should be_all_received
       end
@@ -35,7 +35,7 @@ describe Fakettp::Expectation do
         Fakettp::Expectation.create! :executed => true
         Fakettp::Expectation.create! :executed => false
       end
-      
+
       it 'returns false' do
         Fakettp::Expectation.should_not be_all_received
       end
@@ -46,13 +46,13 @@ describe Fakettp::Expectation do
         Fakettp::Expectation.create! :executed => true
         Fakettp::Expectation.create! :executed => true
       end
-      
+
       it 'returns true' do
         Fakettp::Expectation.should be_all_received
       end
     end
   end
-  
+
   describe 'getting the next expectation' do
     describe 'when there are expectations' do
       before do
@@ -60,7 +60,7 @@ describe Fakettp::Expectation do
         @expectation_2 = Fakettp::Expectation.create :executed => false
         @expectation_3 = Fakettp::Expectation.create :executed => false
       end
-  
+
       it 'returns the first unexecuted expectation' do
         Fakettp::Expectation.next.should == @expectation_2
       end
@@ -70,60 +70,62 @@ describe Fakettp::Expectation do
       before do
         Fakettp::Expectation.delete_all
       end
-      
+
       it 'returns nil' do
         Fakettp::Expectation.next.should be_nil
       end
     end
   end
-  
-  describe 'rendering itself' do
-    before do
-      @expectation = Fakettp::Expectation.new(:contents => 'foo')
-    end
 
-    describe 'when not executed' do
-      it 'shows its contents' do
-        @expectation.render.should == 'foo'
+  describe 'executing' do
+    it 'evals the expectation code in the context of the supplied binding' do
+      def getBinding(n)
+        return binding
       end
+      Fakettp::Expectation.new(:contents => 'n + 2').execute(getBinding(2)).should == 4
     end
 
-    describe 'when executed successfully' do
-      before do
-        @expectation.executed = true
-      end
+    it 'marks itself as executed' do
+      expectation = Fakettp::Expectation.create! :contents => ''
+      expectation.execute binding
+      expectation.reload
+      expectation.executed.should be_true
+    end
+  end
+
+  describe 'status' do
+    before do
+      @expectation = Fakettp::Expectation.new
+    end
 
-      it %(shows its contents in a 'pass' span) do
-        @expectation.render.should == '<span class="pass">foo</span>'
+    describe 'when not executed' do
+      it "is 'pending'" do
+        @expectation.status.should == 'pending'
       end
     end
 
-    describe 'when executed with errors' do
+    describe 'when executed' do
       before do
         @expectation.executed = true
-        @expectation.errors = [Fakettp::Error.new]
       end
 
-      it %(shows its contents in a 'fail' span) do
-        @expectation.render.should == '<span class="fail">foo</span>'
+      describe 'without errors' do
+        it "is 'pass'" do
+          @expectation.status.should == 'pass'
+        end
       end
-    end
-  end
 
-  describe 'executing' do
-    it 'evals the expectation code in the context of the supplied binding' do
-      def getBinding(n)
-        return binding
+      describe 'with errors' do
+        before do
+          @expectation.errors << Fakettp::Error.new
+        end
+
+        it "is 'fail'" do
+          @expectation.status.should == 'fail'
+        end
       end
-      Fakettp::Expectation.new(:contents => 'n + 2').execute(getBinding(2)).should == 4
     end
 
-    it 'marks itself as executed' do
-      expectation = Fakettp::Expectation.create! :contents => ''
-      expectation.execute binding
-      expectation.reload
-      expectation.executed.should be_true
-    end
   end
 end
 
@@ -131,11 +133,11 @@ describe Fakettp::Expectation::Error do
   it 'stores a message' do
     Fakettp::Expectation::Error.new('foo', 2).message.should == 'foo'
   end
-  
+
   it 'stores a line number' do
     Fakettp::Expectation::Error.new('foo', 2).line_number.should == 2
   end
-  
+
   it 'defaults the line number to nil' do
     Fakettp::Expectation::Error.new('foo').line_number.should be_nil
   end

data/spec/fakettp/simulator_spec.rb

@@ -5,38 +5,38 @@ describe Fakettp::Simulator do
     Fakettp::Expectation.stub! :delete_all
     Fakettp::Error.stub! :delete_all
   end
-  
+
   describe "resetting" do
     def do_reset
       Fakettp::Simulator.reset
     end
-    
+
     it 'clears expectations' do
       Fakettp::Expectation.should_receive :delete_all
       do_reset
     end
-    
+
     it 'clears errors' do
       Fakettp::Error.should_receive :delete_all
       do_reset
     end
   end
-  
+
   describe 'adding an expectation' do
     before do
       @expectation = stub(:expectation)
     end
-    
+
     def do_add
       Fakettp::Simulator << @expectation
     end
-    
+
     it 'creates a new expectation' do
       Fakettp::Expectation.should_receive(:create!).with :contents => @expectation
       do_add
     end
   end
-  
+
   describe 'handling a request' do
     before do
       @binding = stub :binding
@@ -44,89 +44,89 @@ describe Fakettp::Simulator do
       @expectation = mock Fakettp::Expectation, :execute => @result
       Fakettp::Expectation.stub!(:next).and_return @expectation
     end
-    
+
     def do_handle
       Fakettp::Simulator.handle_request @binding
     end
-    
+
     it 'executes the next request' do
       @expectation.should_receive(:execute).with @binding
       do_handle
     end
-    
+
     it 'returns the execution result' do
       do_handle.should == @result
     end
-    
+
     describe 'when there are no expectations left' do
       before do
         Fakettp::Expectation.stub!(:next).and_return nil
       end
-      
+
       it 'adds an error' do
         Fakettp::Error.should_receive(:create!).with(:message => 'Received unexpected request')
         begin
           do_handle
         rescue Fakettp::Expectation::Error;end
       end
-      
+
       it 'raises an exception' do
         lambda {do_handle}.should raise_error(Fakettp::Expectation::Error, 'Received unexpected request')
       end
     end
-    
+
     describe 'when an error occurs while executing the expectation' do
       before do
         @expectation.stub!(:execute).and_raise Fakettp::Expectation::Error.new('foo', 2)
         @errors = stub :errors, :null_object => true
         @expectation.stub!(:errors).and_return @errors
       end
-      
+
       it 'adds an error to the expectation' do
         @errors.should_receive(:create).with(:message => 'foo', :line_number => 2)
         begin
           do_handle
         rescue Fakettp::Expectation::Error;end
       end
-      
+
       it 're-raises the exception' do
         lambda {do_handle}.should raise_error(Fakettp::Expectation::Error, 'foo')
       end
     end
   end
-  
+
   describe "verifying" do
     def do_verify
       Fakettp::Simulator.verify
     end
-    
+
     describe 'when there are pending expectations' do
       before do
         Fakettp::Expectation.stub!(:all_received?).and_return true
       end
-      
+
       describe 'when there are no errors' do
         before do
           Fakettp::Error.stub!(:exists?).with(no_args).and_return false
         end
-      
+
         it { do_verify.should be_true }
       end
-    
+
       describe 'when there are errors' do
         before do
           Fakettp::Error.stub!(:exists?).with(no_args).and_return true
         end
-      
+
         it { do_verify.should be_false }
       end
     end
-    
+
     describe 'when there are pending expectations' do
       before do
         Fakettp::Expectation.stub!(:all_received?).and_return false
       end
-      
+
       it 'adds an error' do
         Fakettp::Error.should_receive(:create!).with(:message => 'Expected request not received')
         do_verify
@@ -135,13 +135,13 @@ describe Fakettp::Simulator do
       it { do_verify.should be_false }
     end
   end
-  
+
   describe 'listing errors' do
     before do
       @errors = stub :errors
       Fakettp::Error.stub!(:list).and_return @errors
     end
-    
+
     it 'returns the error list' do
       Fakettp::Simulator.list_errors.should == @errors
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fakettp
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Kerry Buckley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +00:00
+date: 2009-11-20 00:00:00 +00:00
 default_executable: fakettp
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: HTTP server mocking tool
 email: kerryjbuckley@gmail.com
 executables: