Merge pull request #1139 from M-Zuber/fix#1136-IUserKeysClient.GetAll…

…-GetAllForCurrent IUserKeysClient.GetAll -> GetAllForCurrent()
octokit · Mar 13, 2016 · 00cdf99 · 00cdf99
2 parents c09fb8f + e041f52
commit 00cdf99
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/Octokit.Reactive/Clients/IObservableUserKeysClient.cs b/Octokit.Reactive/Clients/IObservableUserKeysClient.cs
@@ -19,7 +19,8 @@ public interface IObservableUserKeysClient
         /// https://developer.github.com/v3/users/keys/#list-your-public-keys
         /// </remarks>
         /// <returns></returns>
-        IObservable<PublicKey> GetAll();
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        IObservable<PublicKey> GetAllForCurrent();
 
         /// <summary>
         /// Gets all verified public keys for a user.

diff --git a/Octokit.Reactive/Clients/ObservableUserKeysClient.cs b/Octokit.Reactive/Clients/ObservableUserKeysClient.cs
@@ -29,9 +29,9 @@ public ObservableUserKeysClient(IGitHubClient client)
         /// https://developer.github.com/v3/users/keys/#list-your-public-keys
         /// </remarks>
         /// <returns></returns>
-        public IObservable<PublicKey> GetAll()
+        public IObservable<PublicKey> GetAllForCurrent()
         {
-            return _client.GetAll().ToObservable().SelectMany(k => k);
+            return _client.GetAllForCurrent().ToObservable().SelectMany(k => k);
         }
 
         /// <summary>

diff --git a/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs b/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs
@@ -14,7 +14,7 @@ public async Task CanGetAllForCurrentUser()
 
             using (var context = await github.CreatePublicKeyContext())
             {
-                var keys = await github.User.Keys.GetAll();
+                var keys = await github.User.Keys.GetAllForCurrent();
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
@@ -72,7 +72,7 @@ public async Task CanCreateAndDeleteKey()
             await github.User.Keys.Delete(key.Id);
 
             // Verify key no longer exists
-            var keys = await github.User.Keys.GetAll();
+            var keys = await github.User.Keys.GetAllForCurrent();
             Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData));
         }
     }

diff --git a/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs
@@ -21,7 +21,7 @@ public async Task CanGetAllForCurrentUser()
         {
             using (var context = await _github.CreatePublicKeyContext())
             {
-                var observable = _github.User.Keys.GetAll();
+                var observable = _github.User.Keys.GetAllForCurrent();
                 var keys = await (observable.ToList());
 
                 Assert.NotEmpty(keys);
@@ -80,7 +80,7 @@ public async Task CanCreateAndDeleteKey()
             await _github.User.Keys.Delete(key.Id);
 
             // Verify key no longer exists
-            var keys = await (_github.User.Keys.GetAll().ToList());
+            var keys = await (_github.User.Keys.GetAllForCurrent().ToList());
             Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData));
         }
     }

diff --git a/Octokit.Tests/Clients/UserKeysClientTests.cs b/Octokit.Tests/Clients/UserKeysClientTests.cs
@@ -8,7 +8,7 @@ namespace Octokit.Tests.Clients
 {
     public class UserKeysClientTests
     {
-        public class TheGetAllMethod
+        public class TheGetAllForCurrentMethod
         {
             [Fact]
             public void RequestsTheCorrectUrl()
@@ -17,7 +17,7 @@ public void RequestsTheCorrectUrl()
                 var client = new UserKeysClient(connection);
 
                 var expectedUri = "user/keys";
-                client.GetAll();
+                client.GetAllForCurrent();
 
                 connection.Received().GetAll<PublicKey>(
                     Arg.Is<Uri>(u => u.ToString() == expectedUri));

diff --git a/Octokit.Tests/Reactive/ObservableUserKeysClientTests.cs b/Octokit.Tests/Reactive/ObservableUserKeysClientTests.cs
@@ -8,17 +8,17 @@ namespace Octokit.Tests.Reactive
 {
     public class ObservableUserKeysClientTests
     {
-        public class TheGetAllMethod
+        public class TheGetAllForCurrentMethod
         {
             [Fact]
             public void CallsIntoClient()
             {
                 var gitHubClient = Substitute.For<IGitHubClient>();
                 var client = new ObservableUserKeysClient(gitHubClient);
 
-                client.GetAll();
+                client.GetAllForCurrent();
 
-                gitHubClient.User.Keys.Received().GetAll();
+                gitHubClient.User.Keys.Received().GetAllForCurrent();
             }
         }
 

diff --git a/Octokit/Clients/IUserKeysClient.cs b/Octokit/Clients/IUserKeysClient.cs
@@ -19,7 +19,8 @@ public interface IUserKeysClient
         /// https://developer.github.com/v3/users/keys/#list-your-public-keys
         /// </remarks>
         /// <returns></returns>
-        Task<IReadOnlyList<PublicKey>> GetAll();
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        Task<IReadOnlyList<PublicKey>> GetAllForCurrent();
 
         /// <summary>
         /// Gets all verified public keys for a user.

diff --git a/Octokit/Clients/UserKeysClient.cs b/Octokit/Clients/UserKeysClient.cs
@@ -23,7 +23,7 @@ public UserKeysClient(IApiConnection apiConnection)
         /// https://developer.github.com/v3/users/keys/#list-your-public-keys
         /// </remarks>
         /// <returns></returns>
-        public Task<IReadOnlyList<PublicKey>> GetAll()
+        public Task<IReadOnlyList<PublicKey>> GetAllForCurrent()
         {
             return ApiConnection.GetAll<PublicKey>(ApiUrls.Keys());
         }