Refactored some repetition out of lib/spec

zph · zph · commit bc55d859d947 · 2013-05-20T01:14:00.000-04:00
diff --git a/lib/buff/core.rb b/lib/buff/core.rb
@@ -15,6 +15,8 @@ def get(path, options={})
         interpret_response(response)
       end
 
+      #TODO post data isn't limited to body requests in post
+      #split out the options data separately
       def post(path, post_data)
         @conn.post do |req|
           req.url path.gsub(%r{^\/}, '')
diff --git a/lib/buff/profile.rb b/lib/buff/profile.rb
@@ -20,6 +20,7 @@ def profile_schedules_by_id(id, options={})
       # currently deletes schedule due to malformed request
       def set_schedules(id, options={})
         # schedules = options.fetch(:schedules) { raise ArgumentError }
+        raise ArgumentError unless ENV['BUFFER_DEBUG']
         response = post("/profiles/#{id}/schedules/update.json", options )
           Buff::Response.new(JSON.parse(response.body))
       end
diff --git a/lib/buff/update.rb b/lib/buff/update.rb
@@ -30,7 +30,7 @@ def interactions_by_update_id(id, options={})
 
       def reorder_updates(profile_id, options={})
         # order, optional: offset, utc
-        order = options.fetch(:order) { raise ArgumentError }
+        options.fetch(:order) { raise ArgumentError }
         response = post("/profiles/#{profile_id}/updates/reorder.json", options)
       end
 
@@ -41,13 +41,6 @@ def shuffle_updates(profile_id, options={})
 
         #TODO
       def create_update(options={})
-
-        # POST Data
-        #     text=This%20is%20an%20example%20update&
-        #     profile_ids[]=4eb854340acb04e870000010&
-        #     profile_ids[]=4eb9276e0acb04bb81000067&
-        #     media[link]=http%3A%2F%2Fgoogle.com&
-        #     media[description]=The%20google%20homepage
         # options = {
         #   text: "bodytext",
         #   profile_ids: ["230958239058", "23059u2350923"],
diff --git a/spec/lib/buff/link_spec.rb b/spec/lib/buff/link_spec.rb
@@ -6,8 +6,8 @@
     let(:url) { %q{http://bufferapp.com} }
 
     before do
-      stub_request(:get, "https://api.bufferapp.com/1/links/shares.json?access_token=some_token&url=http://bufferapp.com").
-        to_return(fixture('link.txt'))
+      stub_request(:get, "#{ base_path }/links/shares.json?#{ access_token_param }&url=http://bufferapp.com").
+      to_return(fixture('link.txt'))
     end
 
     it "connects to the correct endpoint" do
diff --git a/spec/lib/buff_spec.rb b/spec/lib/buff_spec.rb
@@ -18,9 +18,8 @@
     let(:rash) { subject.user_info }
 
     before(:each) do
-      stub_request(:get, 'https://api.bufferapp.com/1/user.json').
-        with(query: { 'access_token' => 'some_token'}).
-        to_return(fixture('user_authenticated.txt'))
+      url = "#{ base_path }/user.json"
+      stub_with_to_return(:get, url, "user_authenticated.txt")
     end
 
     it "returns a Rash object" do
@@ -36,9 +35,8 @@
     let(:rash) { Buff::Client.new("some_token").profiles }
 
     before(:each) do
-      stub_request(:get, 'https://api.bufferapp.com/1/profiles.json').
-        with(query: { 'access_token' => 'some_token'}).
-        to_return(fixture('profile_authenticated.txt'))
+      url = "#{ base_path }/profiles.json"
+      stub_with_to_return(:get, url, 'profile_authenticated.txt')
     end
 
     it "makes the correct url request" do
@@ -57,9 +55,9 @@
   describe "#profile_by_id" do
     let(:id) { "5160746d54f04a5e3a00000f" }
     before(:each) do
-      stub_request(:get, "https://api.bufferapp.com/1/profiles/#{id}.json").
-        with(query: { 'access_token' => 'some_token'}).
-        to_return(fixture('profiles_by_id.txt'))
+      url = "#{base_path}/profiles/#{id}.json"
+      fixture_name = "profiles_by_id.txt"
+      stub_with_to_return(:get, url, fixture_name)
     end
 
     let(:rash) { Buff::Client.new("some_token").profile_by_id(id) }
@@ -75,9 +73,9 @@
 
   describe "#profile_schedules_by_id" do
     before(:each) do
-      stub_request(:get, "https://api.bufferapp.com/1/profiles/#{id}/schedules.json").
-        with(query: { 'access_token' => 'some_token'}).
-        to_return(fixture('profile_schedules_by_id.txt'))
+      url = "#{base_path}/profiles/#{id}/schedules.json"
+      fixture_name = 'profile_schedules_by_id.txt'
+      stub_with_to_return(:get, url, fixture_name)
     end
 
     let(:rash) { Buff::Client.new("some_token").profile_schedules_by_id(id) }
@@ -107,7 +105,7 @@
 
   describe "#info" do
     before do
-      stub_request(:get, "https://api.bufferapp.com/1/info/configuration.json?access_token=some_token").
+      stub_request(:get, "#{base_path}/info/configuration.json?access_token=some_token").
         to_return(fixture("info.txt"))
     end
 
@@ -182,8 +180,7 @@
 
   it "dumping a double schedule yields correct json" do
     schedules = Buff::Schedules.new
-    schedules << @schedule
-    schedules << @schedule
+    schedules << @schedule << @schedule
     @sample_schedules = @sample_schedules.to_json
 
     schedules.dump.should eq(@sample_schedules)
@@ -195,15 +192,15 @@
   let(:client) { Buff::Client.new("some_token") }
   describe "#get" do
     it "delegates to #handle_response_code when code != 200" do
-       stub_request(:get, "https://api.bufferapp.com/1/info/configuration.json?access_token=some_token").
+       stub_request(:get, "#{base_path}/info/configuration.json?access_token=some_token").
          to_return(:status => 403, :body => "", :headers => {})
        client.should_receive(:handle_response_code).once
        client.info
     end
 
 
     it "does not delegate to #handle_response_code when code = 200" do
-       stub_request(:get, "https://api.bufferapp.com/1/info/configuration.json?access_token=some_token").
+       stub_request(:get, "#{base_path}/info/configuration.json?access_token=some_token").
          to_return(fixture("link.txt"))
        client.should_not_receive(:handle_response_code)
        client.info
@@ -214,7 +211,7 @@
 
     it "connects to the correct endpoint" do
 
-#TODO improve test
+    #TODO improve test
       response = %Q[{"success": true, "message": "Schedule saved successfully"}]
       id = "4eb854340acb04e870000010"
       stub_request(:post, %r{https://api\.bufferapp\.com/1/profiles/4eb854340acb04e870000010/schedules/update\.json\?access_token=.*}).
@@ -226,8 +223,9 @@
     end
 
     xit "does not delegate to #handle_response_code when code = 200" do
-       stub_request(:get, "https://api.bufferapp.com/1/info/configuration.json?access_token=some_token").
-         to_return(fixture("link.txt"))
+      url = "#{base_path}/info/configuration.json"
+      fixture_name = "link.txt"
+      stub_with_to_return(:get, url, fixture_name)
        client.should_not_receive(:handle_response_code)
        client.info
     end
@@ -243,9 +241,8 @@
     context "fails gracefully with undocumented responses" do
       it "responds to 401 unauthorized response" do
         id = "4eb8565e0acb04bb82000004"
-        stub_request(:get, "https://api.bufferapp.com/1/updates/#{id}.json?access_token=some_token").
-          to_return(fixture("update_by_id_non_auth.txt"))
-
+        url = "#{base_path}/updates/#{id}.json?access_token=some_token"
+        stub_with_to_return(:get, url, "update_by_id_non_auth.txt")
         lambda { client.update_by_id(id) }.
           should raise_error(Buff::APIError)
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,7 +26,28 @@ def sample_schedules2
       {days: %w[mon tue wed],
       times: %w[12:00 17:00 18:00]},
     ]
+
+end
+
+def base_path
+  "https://api.bufferapp.com/1"
+end
+
+def access_token_param
+  "access_token=some_token"
 end
+
+def stub_with_to_return(request_type, url, fixture_name, query_hash={})
+  query = access_hash.merge(query_hash)
+  stub_request(request_type, url).
+     with(query: query).
+     to_return(fixture(fixture_name))
+end
+
+def access_hash
+  { 'access_token' => 'some_token'}
+end
+
 def sample_schedules
   [
     [{ days: %w[mon tue wed],
