.gitmodules vendor/fakeweb @@ -5,7 +5,7 @@ task :default => :spec spec_opts = 'spec/spec.opts' spec_glob = FileList['spec/**/*_spec.rb'] -libs = ['lib', 'spec'] +libs = ['lib', 'spec', 'vendor/fakeweb/lib'] desc 'Run all specs in spec directory' Spec::Rake::SpecTask.new(:spec) do |t| Rakefile @@ -35,30 +35,26 @@ describe Contacts::Google, '.authentication_url' do end it 'should be able to exchange one-time for session token' do - # connection = mock_connection - # response = mock_response - # Net::HTTP.expects(:new).with('www.google.com', 443).returns(connection) - # connection.expects(:start) - # connection.expects(:get).with('/accounts/AuthSubSessionToken', 'Authorization' => %(AuthSub token="dummytoken")).returns(response) - # response.expects(:body).returns() - FakeWeb::register_uri 'https://www.google.com/accounts/AuthSubSessionToken', + FakeWeb::register_uri(:get, 'https://www.google.com/accounts/AuthSubSessionToken', :string => "Token=G25aZ-v_8B\nExpiration=20061004T123456Z", :verify => lambda { |req| req['Authorization'].should == %(AuthSub token="dummytoken") } + ) Contacts::Google.session_token('dummytoken').should == 'G25aZ-v_8B' end it "should support client login" do - FakeWeb::register_uri 'https://www.google.com/accounts/ClientLogin', + FakeWeb::register_uri(:post, 'https://www.google.com/accounts/ClientLogin', :method => 'POST', :query => { 'accountType' => 'GOOGLE', 'service' => 'cp', 'source' => 'Contacts-Ruby', 'Email' => 'mislav@example.com', 'Passwd' => 'dummyPassword' }, :string => "SID=klw4pHhL_ry4jl6\nLSID=Ij6k-7Ypnc1sxm\nAuth=EuoqMSjN5uo-3B" - + ) + Contacts::Google.client_login('mislav@example.com', 'dummyPassword').should == 'EuoqMSjN5uo-3B' end spec/gmail/auth_spec.rb @@ -17,13 +17,14 @@ describe Contacts::Google do describe 'fetches contacts feed via HTTP GET' do it 'with defaults' do - FakeWeb::register_uri 'www.google.com/m8/feeds/contacts/default/thin', + FakeWeb::register_uri(:get, 'www.google.com/m8/feeds/contacts/default/thin', :string => 'thin results', :verify => lambda { |req| req['Authorization'].should == %(AuthSub token="dummytoken") req['Accept-Encoding'].should == 'gzip' req['User-Agent'].should == "Ruby Contacts v#{Contacts::VERSION::STRING} (gzip)" } + ) response = @gmail.get({}) response.body.should == 'thin results' @@ -33,8 +34,9 @@ describe Contacts::Google do @gmail = Contacts::Google.new('dummytoken', 'person@example.com') @gmail.projection = 'full' - FakeWeb::register_uri 'www.google.com/m8/feeds/contacts/person%40example.com/full', + FakeWeb::register_uri(:get, 'www.google.com/m8/feeds/contacts/person%40example.com/full', :string => 'full results' + ) response = @gmail.get({}) response.body.should == 'full results' @@ -69,8 +71,9 @@ describe Contacts::Google do end it 'raises a fetching error when something goes awry' do - FakeWeb::register_uri 'www.google.com/m8/feeds/contacts/default/thin', + FakeWeb::register_uri(:get, 'www.google.com/m8/feeds/contacts/default/thin', :status => [404, 'YOU FAIL'] + ) lambda { @gmail.get({}) @@ -137,7 +140,10 @@ describe Contacts::Google do end it 'should have implicit :descending with :order' do - expect_params({ 'orderby' => 'lastmodified', 'sortorder' => 'descending' }, true) + expect_params 'orderby' => 'lastmodified', + 'sortorder' => 'descending', + 'max-results' => '200' + @gmail.contacts :order => 'lastmodified' end @@ -151,9 +157,9 @@ describe Contacts::Google do @gmail.contacts :limit => nil, :offset => 0 end - def expect_params(params, partial = false) - FakeWeb::register_uri 'www.google.com/m8/feeds/contacts/default/thin', - :query => params, :query_partial_match => partial + def expect_params(params) + query_string = Contacts::Google.query_string(params) + FakeWeb::register_uri(:get, "www.google.com/m8/feeds/contacts/default/thin?#{query_string}") end end spec/gmail/fetching_spec.rb @@ -6,6 +6,7 @@ require 'mocha' require 'cgi' require 'fake_web' +FakeWeb.allow_net_connect = false module SampleFeeds FEED_DIR = File.dirname(__FILE__) + '/feeds/' spec/spec_helper.rb spec/fake_net_http.rb spec/fake_web.rb 461962f70684086b28998e09b5158e80575a7f58 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mislav/contacts/commit/9bc68f98b081e85579aa4a97ea7e0d32cae9800f 9bc68f98b081e85579aa4a97ea7e0d32cae9800f 2009-01-08T21:03:45-08:00 2009-01-08T21:03:45-08:00 add mislav/fakeweb as submodule and compensate for the changes f4948e271e7f391fc090c6a7d2ba2030cdddf35b Mislav Marohnić mislav.marohnic@gmail.com