<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>shoulda_macros/twitter_search.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -72,5 +72,4 @@ module TwitterSearch
       end
 
   end
-
 end</diff>
      <filename>lib/twitter_search.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,3 @@
-require File.expand_path('../lib/twitter_search', File.dirname(__FILE__))
-require 'test/unit'
-require 'rubygems'
-require 'shoulda'
-require 'yaml'
-
 class String
   def /(other)
     File.join(self, other)
@@ -16,38 +10,14 @@ class File
   end
 end
 
-class Test::Unit::TestCase
-
-  def self.should_have_default_search_behaviors
-    should_find_tweets
-    should_have_text_for_all_tweets
-    should_return_page 1
-    should_return_tweets_in_sets_of 15
-  end
-
-  def self.should_find_tweets
-    should 'find tweets' do
-      assert @tweets.any?
-    end
-  end
-
-  def self.should_have_text_for_all_tweets
-    should 'have text for all tweets' do
-      assert @tweets.all? { |tweet| tweet.text.size &gt; 0 }
-    end
-  end
-
-  def self.should_return_page(number)
-    should &quot;return page #{number}&quot; do
-      assert_equal number, @tweets.page
-    end
-  end
+require 'test/unit'
+require 'rubygems'
+require 'shoulda'
+require 'yaml'
+require File.here / '..' / 'lib' / 'twitter_search'
+require File.here / '..' / 'shoulda_macros' / 'twitter_search'
 
-  def self.should_return_tweets_in_sets_of(number)
-    should &quot;return tweets in sets of #{number}&quot; do
-      assert_equal number, @tweets.results_per_page
-    end
-  end
+class Test::Unit::TestCase
 
   def read_yaml(opts = {})
     if opts[:file].nil?</diff>
      <filename>test/test_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,10 @@
-# coding: utf-8
-
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 gem('fakeweb', '&gt;=1.2.0')
 require 'fakeweb'
 
-FakeWeb.allow_net_connect = false # an insurance policy against hitting http://twitter.com
+# an insurance policy against hitting http://twitter.com
+FakeWeb.allow_net_connect = false
 
 class TwitterSearchTest &lt; Test::Unit::TestCase # :nodoc:
 
@@ -25,9 +24,9 @@ class TwitterSearchTest &lt; Test::Unit::TestCase # :nodoc:
     setup do
       @tweets = read_yaml :file =&gt; 'twitter_search'
     end
-    
+
     should_have_default_search_behaviors
-    
+
     should 'find tweets containing both &quot;twitter&quot; and &quot;search&quot;' do
       assert @tweets.all?{ |t| t.text =~ /twitter/i &amp;&amp; t.text =~ /search/i }
     end
@@ -37,9 +36,9 @@ class TwitterSearchTest &lt; Test::Unit::TestCase # :nodoc:
     setup do
       @tweets = read_yaml :file =&gt; 'twitter_search_and'
     end
-    
+
     should_have_default_search_behaviors
-    
+
     should 'find tweets containing both &quot;twitter&quot; and &quot;search&quot;' do
       assert @tweets.all?{ |t| t.text =~ /twitter/i &amp;&amp; t.text =~ /search/i }
     end</diff>
      <filename>test/twitter_search_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>997c8ee60f8510f93e9dfc6e3cbfb909554da310</id>
    </parent>
  </parents>
  <author>
    <name>Dan Croak</name>
    <email>dcroak@thoughtbot.com</email>
  </author>
  <url>http://github.com/dancroak/twitter-search/commit/f4d27a3d0a14f8e3444da4dd287f019048bd8634</url>
  <id>f4d27a3d0a14f8e3444da4dd287f019048bd8634</id>
  <committed-date>2009-05-16T10:33:43-07:00</committed-date>
  <authored-date>2009-05-16T10:33:43-07:00</authored-date>
  <message>refactored shoulda macros into conventional shoulda_macros directory</message>
  <tree>02ab26df27863ff09b21f2c601443677ee4207db</tree>
  <committer>
    <name>Dan Croak</name>
    <email>dcroak@thoughtbot.com</email>
  </committer>
</commit>
