Merge pull request octokit#393 from joeyw/fix-subscriptions-method

Fix #subscriptions method.
stmllr · Dec 27, 2013 · d93bd97 · d93bd97
2 parents 22d042b + 56b8d25
commit d93bd97
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/lib/octokit/client/users.rb b/lib/octokit/client/users.rb
@@ -352,7 +352,11 @@ def remove_email(email)
       # @example
       #   @client.subscriptions("pengwynn")
       def subscriptions(user=login, options = {})
-        path = user_authenticated? ? "user/subscriptions" : "users/#{user}/subscriptions"
+        if user == login && user_authenticated? 
+          path = "user/subscriptions"
+        else
+          path = "users/#{user}/subscriptions"
+        end
         paginate path, options
       end
       alias :watched :subscriptions

diff --git a/...ubscriptions/authenticated/returns_the_repositories_a_user_watches_for_notifications.json b/...ubscriptions/authenticated/returns_the_repositories_a_user_watches_for_notifications.json
diff --git a/...henticated/returns_the_repositories_the_authenticated_user_watches_for_notifications.json b/...henticated/returns_the_repositories_the_authenticated_user_watches_for_notifications.json
diff --git a/...riptions/not_authenticated/returns_the_repositories_a_user_watches_for_notifications.json b/...riptions/not_authenticated/returns_the_repositories_a_user_watches_for_notifications.json
diff --git a/...lient_Users/_subscriptions/returns_the_repositories_a_user_watches_for_notifications.json b/...lient_Users/_subscriptions/returns_the_repositories_a_user_watches_for_notifications.json
diff --git a/...scriptions/returns_the_repositories_the_authenticated_user_watches_for_notifications.json b/...scriptions/returns_the_repositories_the_authenticated_user_watches_for_notifications.json
diff --git a/spec/octokit/client/users_spec.rb b/spec/octokit/client/users_spec.rb
@@ -201,13 +201,23 @@
   end # .remove_email
 
   describe ".subscriptions", :vcr do
-    it "returns the repositories a user watches for notifications" do
-      subscriptions = Octokit.subscriptions("pengwynn")
-      assert_requested :get, github_url("/users/pengwynn/subscriptions")
+    context "not authenticated" do
+      it "returns the repositories a user watches for notifications" do
+        subscriptions = Octokit.subscriptions("pengwynn")
+        assert_requested :get, github_url("/users/pengwynn/subscriptions")
+      end
     end
-    it "returns the repositories the authenticated user watches for notifications" do
-      subscriptions = @client.subscriptions
-      assert_requested :get, github_url("/user/subscriptions")
+
+    context "authenticated" do
+      it "returns the repositories the authenticated user watches for notifications" do
+        subscriptions = @client.subscriptions
+        assert_requested :get, github_url("/user/subscriptions")
+      end
+
+      it "returns the repositories a user watches for notifications" do
+        subscriptions = @client.subscriptions("pengwynn")
+        assert_requested :get, github_url("/users/pengwynn/subscriptions")
+      end
     end
   end # .subscriptions