twitter 4.8.1 → 5.0.0

data/spec/twitter/{api → rest/api}/lists_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Lists do
+describe Twitter::REST::API::Lists do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#lists" do
@@ -18,7 +18,7 @@ describe Twitter::API::Lists do
       lists = @client.lists
       expect(lists).to be_an Array
       expect(lists.first).to be_a Twitter::List
-      expect(lists.first.name).to eq "Rubyists"
+      expect(lists.first.name).to eq("Rubyists")
     end
   end
 
@@ -35,7 +35,34 @@ describe Twitter::API::Lists do
         tweets = @client.list_timeline("sferik", "presidents")
         expect(tweets).to be_an Array
         expect(tweets.first).to be_a Twitter::Tweet
-        expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+        expect(tweets.first.text).to eq("Happy Birthday @imdane. Watch out for those @rally pranksters!")
+      end
+      context "with a URI object passed" do
+        it "requests the correct resource" do
+          list = URI.parse("https://twitter.com/sferik/presidents")
+          @client.list_timeline(list)
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with a URI string passed" do
+        it "requests the correct resource" do
+          @client.list_timeline("https://twitter.com/sferik/presidents")
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with URI objects passed" do
+        it "requests the correct resource" do
+          user = URI.parse("https://twitter.com/sferik")
+          list = URI.parse("https://twitter.com/sferik/presidents")
+          @client.list_timeline(user, list)
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with URI strings passed" do
+        it "requests the correct resource" do
+          @client.list_timeline("https://twitter.com/sferik", "https://twitter.com/sferik/presidents")
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
       end
     end
     context "without a screen name passed" do
@@ -50,19 +77,19 @@ describe Twitter::API::Lists do
     end
   end
 
-  describe "#list_remove_member" do
+  describe "#remove_list_member" do
     context "with a screen name passed" do
       before do
         stub_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_member("sferik", "presidents", 813286)
+        @client.remove_list_member("sferik", "presidents", 813286)
         expect(a_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"})).to have_been_made
       end
       it "returns the list" do
-        list = @client.list_remove_member("sferik", "presidents", 813286)
+        list = @client.remove_list_member("sferik", "presidents", 813286)
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -71,7 +98,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_member("presidents", 813286)
+        @client.remove_list_member("presidents", 813286)
         expect(a_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"})).to have_been_made
       end
     end
@@ -89,16 +116,15 @@ describe Twitter::API::Lists do
       it "returns the lists the specified user has been added to" do
         memberships = @client.memberships("sferik")
         expect(memberships).to be_a Twitter::Cursor
-        expect(memberships.lists).to be_an Array
-        expect(memberships.lists.first).to be_a Twitter::List
-        expect(memberships.lists.first.name).to eq "developer"
+        expect(memberships.first).to be_a Twitter::List
+        expect(memberships.first.name).to eq("developer")
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships("sferik").all
+          @client.memberships("sferik").each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -112,12 +138,12 @@ describe Twitter::API::Lists do
         @client.memberships(7505382)
         expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships(7505382).all
+          @client.memberships(7505382).each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -132,12 +158,12 @@ describe Twitter::API::Lists do
         @client.memberships
         expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships.all
+          @client.memberships.each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -157,16 +183,15 @@ describe Twitter::API::Lists do
       it "returns the subscribers of the specified list" do
         list_subscribers = @client.list_subscribers("sferik", "presidents")
         expect(list_subscribers).to be_a Twitter::Cursor
-        expect(list_subscribers.users).to be_an Array
-        expect(list_subscribers.users.first).to be_a Twitter::User
-        expect(list_subscribers.users.first.id).to eq 7505382
+        expect(list_subscribers.first).to be_a Twitter::User
+        expect(list_subscribers.first.id).to eq(7505382)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers("sferik", "presidents").all
+          @client.list_subscribers("sferik", "presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -180,12 +205,12 @@ describe Twitter::API::Lists do
         @client.list_subscribers(7505382, "presidents")
         expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers(7505382, "presidents").all
+          @client.list_subscribers(7505382, "presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -200,12 +225,12 @@ describe Twitter::API::Lists do
         @client.list_subscribers("presidents")
         expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers("presidents").all
+          @client.list_subscribers("presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -225,7 +250,7 @@ describe Twitter::API::Lists do
       it "returns the specified list" do
         list = @client.list_subscribe("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -253,15 +278,15 @@ describe Twitter::API::Lists do
       end
       it "returns true if the specified user subscribes to the specified list" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 813286)
-        expect(list_subscriber).to be_true
+        expect(list_subscriber).to be true
       end
       it "returns false if the specified user does not subscribe to the specified list" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 18755393)
-        expect(list_subscriber).to be_false
+        expect(list_subscriber).to be false
       end
       it "returns false if user does not exist" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 12345678)
-        expect(list_subscriber).to be_false
+        expect(list_subscriber).to be false
       end
     end
     context "with a owner ID passed" do
@@ -325,7 +350,7 @@ describe Twitter::API::Lists do
       it "returns the specified list" do
         list = @client.list_unsubscribe("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -340,19 +365,19 @@ describe Twitter::API::Lists do
     end
   end
 
-  describe "#list_add_members" do
+  describe "#add_list_members" do
     context "with a screen name passed" do
       before do
         stub_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_add_members("sferik", "presidents", [813286, 18755393])
+        @client.add_list_members("sferik", "presidents", [813286, 18755393])
         expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"})).to have_been_made
       end
       it "returns the list" do
-        list = @client.list_add_members("sferik", "presidents", [813286, 18755393])
+        list = @client.add_list_members("sferik", "presidents", [813286, 18755393])
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a combination of member IDs and member screen names to add" do
@@ -360,7 +385,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_add_members("sferik", "presidents", [813286, "pengwynn", 18755393, "erebor"])
+        @client.add_list_members("sferik", "presidents", [813286, "pengwynn", 18755393, "erebor"])
         expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"})).to have_been_made
       end
     end
@@ -370,7 +395,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_add_members("presidents", [813286, 18755393])
+        @client.add_list_members("presidents", [813286, 18755393])
         expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"})).to have_been_made
       end
     end
@@ -389,15 +414,15 @@ describe Twitter::API::Lists do
       end
       it "returns true if user is a list member" do
         list_member = @client.list_member?("sferik", "presidents", 813286)
-        expect(list_member).to be_true
+        expect(list_member).to be true
       end
       it "returns false if user is not a list member" do
         list_member = @client.list_member?("sferik", "presidents", 65493023)
-        expect(list_member).to be_false
+        expect(list_member).to be false
       end
       it "returns false if user does not exist" do
         list_member = @client.list_member?("sferik", "presidents", 12345678)
-        expect(list_member).to be_false
+        expect(list_member).to be false
       end
     end
     context "with an owner ID passed" do
@@ -461,16 +486,15 @@ describe Twitter::API::Lists do
       it "returns the members of the specified list" do
         list_members = @client.list_members("sferik", "presidents")
         expect(list_members).to be_a Twitter::Cursor
-        expect(list_members.users).to be_an Array
-        expect(list_members.users.first).to be_a Twitter::User
-        expect(list_members.users.first.id).to eq 7505382
+        expect(list_members.first).to be_a Twitter::User
+        expect(list_members.first.id).to eq(7505382)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members("sferik", "presidents").all
+          @client.list_members("sferik", "presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -484,12 +508,12 @@ describe Twitter::API::Lists do
         @client.list_members(7505382, "presidents")
         expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members(7505382, "presidents").all
+          @client.list_members(7505382, "presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -504,12 +528,12 @@ describe Twitter::API::Lists do
         @client.list_members("presidents")
         expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members("presidents").all
+          @client.list_members("presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -517,19 +541,19 @@ describe Twitter::API::Lists do
     end
   end
 
-  describe "#list_add_member" do
+  describe "#add_list_member" do
     context "with a screen name passed" do
       before do
         stub_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_add_member("sferik", "presidents", 813286)
+        @client.add_list_member("sferik", "presidents", 813286)
         expect(a_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"})).to have_been_made
       end
       it "returns the list" do
-        list = @client.list_add_member("sferik", "presidents", 813286)
+        list = @client.add_list_member("sferik", "presidents", 813286)
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -538,25 +562,25 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_add_member("presidents", 813286)
+        @client.add_list_member("presidents", 813286)
         expect(a_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286"})).to have_been_made
       end
     end
   end
 
-  describe "#list_destroy" do
+  describe "#destroy_list" do
     context "with a screen name passed" do
       before do
         stub_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_destroy("sferik", "presidents")
+        @client.destroy_list("sferik", "presidents")
         expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
       end
       it "returns the deleted list" do
-        list = @client.list_destroy("sferik", "presidents")
+        list = @client.destroy_list("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -565,7 +589,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_destroy("presidents")
+        @client.destroy_list("presidents")
         expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
       end
     end
@@ -574,7 +598,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :list_id => "12345678"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_destroy("sferik", 12345678)
+        @client.destroy_list("sferik", 12345678)
         expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => "sferik", :list_id => "12345678"})).to have_been_made
       end
     end
@@ -584,7 +608,7 @@ describe Twitter::API::Lists do
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => "12345678", :user => {:id => 7505382, :screen_name => "sferik"})
-        @client.list_destroy(list)
+        @client.destroy_list(list)
         expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_id => "7505382", :list_id => "12345678"})).to have_been_made
       end
     end
@@ -602,7 +626,7 @@ describe Twitter::API::Lists do
       it "returns the updated list" do
         list = @client.list_update("sferik", "presidents", :description => "Presidents of the United States of America")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -636,18 +660,18 @@ describe Twitter::API::Lists do
     end
   end
 
-  describe "#list_create" do
+  describe "#create_list" do
     before do
       stub_post("/1.1/lists/create.json").with(:body => {:name => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
-      @client.list_create("presidents")
+      @client.create_list("presidents")
       expect(a_post("/1.1/lists/create.json").with(:body => {:name => "presidents"})).to have_been_made
     end
     it "returns the created list" do
-      list = @client.list_create("presidents")
+      list = @client.create_list("presidents")
       expect(list).to be_a Twitter::List
-      expect(list.name).to eq "presidents"
+      expect(list.name).to eq("presidents")
     end
   end
 
@@ -663,7 +687,7 @@ describe Twitter::API::Lists do
       it "returns the updated list" do
         list = @client.list("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a user ID passed" do
@@ -728,16 +752,15 @@ describe Twitter::API::Lists do
       it "returns the lists the specified user follows" do
         subscriptions = @client.subscriptions("sferik")
         expect(subscriptions).to be_a Twitter::Cursor
-        expect(subscriptions.lists).to be_an Array
-        expect(subscriptions.lists.first).to be_a Twitter::List
-        expect(subscriptions.lists.first.name).to eq "Rubyists"
+        expect(subscriptions.first).to be_a Twitter::List
+        expect(subscriptions.first.name).to eq("Rubyists")
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions("sferik").all
+          @client.subscriptions("sferik").each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -751,12 +774,12 @@ describe Twitter::API::Lists do
         @client.subscriptions(7505382)
         expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions(7505382).all
+          @client.subscriptions(7505382).each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -771,12 +794,12 @@ describe Twitter::API::Lists do
         @client.subscriptions
         expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions.all
+          @client.subscriptions.each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -784,19 +807,19 @@ describe Twitter::API::Lists do
     end
   end
 
-  describe "#list_remove_members" do
+  describe "#remove_list_members" do
     context "with a screen name passed" do
       before do
         stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_members("sferik", "presidents", [813286, 18755393])
+        @client.remove_list_members("sferik", "presidents", [813286, 18755393])
         expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"})).to have_been_made
       end
       it "returns the list" do
-        list = @client.list_remove_members("sferik", "presidents", [813286, 18755393])
+        list = @client.remove_list_members("sferik", "presidents", [813286, 18755393])
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a user ID passed" do
@@ -804,7 +827,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_id => "7505382", :slug => "presidents", :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_members(7505382, "presidents", [813286, 18755393])
+        @client.remove_list_members(7505382, "presidents", [813286, 18755393])
         expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_id => "7505382", :slug => "presidents", :user_id => "813286,18755393"})).to have_been_made
       end
     end
@@ -813,7 +836,7 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_members("sferik", "presidents", [813286, "pengwynn", 18755393, "erebor"])
+        @client.remove_list_members("sferik", "presidents", [813286, "pengwynn", 18755393, "erebor"])
         expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"})).to have_been_made
       end
     end
@@ -823,27 +846,26 @@ describe Twitter::API::Lists do
         stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.list_remove_members("presidents", [813286, 18755393])
+        @client.remove_list_members("presidents", [813286, 18755393])
         expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => "sferik", :slug => "presidents", :user_id => "813286,18755393"})).to have_been_made
       end
     end
   end
 
-  describe "#lists_owned" do
+  describe "#owned_lists" do
     context "with a screen name passed" do
       before do
         stub_get("/1.1/lists/ownerships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"}).to_return(:body => fixture("ownerships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.lists_owned("sferik")
+        @client.owned_lists("sferik")
         expect(a_get("/1.1/lists/ownerships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
       it "returns the requested list" do
-        lists = @client.lists_owned("sferik")
+        lists = @client.owned_lists("sferik")
         expect(lists).to be_a Twitter::Cursor
-        expect(lists.lists).to be_an Array
-        expect(lists.lists.first).to be_a Twitter::List
-        expect(lists.lists.first.name).to eq "My favstar.fm list"
+        expect(lists.first).to be_a Twitter::List
+        expect(lists.first.name).to eq("My favstar.fm list")
       end
     end
     context "without a screen name passed" do
@@ -852,15 +874,14 @@ describe Twitter::API::Lists do
         stub_get("/1.1/lists/ownerships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"}).to_return(:body => fixture("ownerships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.lists_owned
+        @client.owned_lists
         expect(a_get("/1.1/lists/ownerships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
       it "returns the requested list" do
-        lists = @client.lists_owned
+        lists = @client.owned_lists
         expect(lists).to be_a Twitter::Cursor
-        expect(lists.lists).to be_an Array
-        expect(lists.lists.first).to be_a Twitter::List
-        expect(lists.lists.first.name).to eq "My favstar.fm list"
+        expect(lists.first).to be_a Twitter::List
+        expect(lists.first.name).to eq("My favstar.fm list")
       end
     end
   end