Merge pull request #22 from martincostello/Update-README

Update examples

Author: martincostello

Directory.Build.props

@@ -24,7 +24,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionPrefix>1.2.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>

README.md

@@ -36,13 +36,15 @@ Below is a minimal example of intercepting a request to an HTTP API for a JSON r
 ```csharp
 // using JustEat.HttpClientInterception;
 
+var options = new HttpClientInterceptorOptions();
+
 var builder = new HttpRequestInterceptionBuilder()
+    .Requests()
     .ForHost("public.je-apis.com")
     .ForPath("terms")
-    .WithJsonContent(new { Id = 1, Link = "https://www.just-eat.co.uk/privacy-policy" });
-
-var options = new HttpClientInterceptorOptions()
-    .Register(builder);
+    .Responds()
+    .WithJsonContent(new { Id = 1, Link = "https://www.just-eat.co.uk/privacy-policy" })
+    .RegisterWith(options);
 
 var client = options.CreateHttpClient();
 
@@ -59,12 +61,13 @@ Below is a minimal example of intercepting a request to inject an HTTP fault:
 ```csharp
 // using JustEat.HttpClientInterception;
 
+var options = new HttpClientInterceptorOptions();
+
 var builder = new HttpRequestInterceptionBuilder()
+    .Requests()
     .ForHost("public.je-apis.com")
-    .WithStatus(HttpStatusCode.InternalServerError);
-
-var options = new HttpClientInterceptorOptions()
-    .Register(builder);
+    .WithStatus(HttpStatusCode.InternalServerError)
+    .RegisterWith(options);
 
 var client = options.CreateHttpClient();
 
@@ -119,7 +122,8 @@ var options = new HttpClientInterceptorOptions();
 
 var server = new WebHostBuilder()
     .UseStartup<Startup>()
-    .ConfigureServices((services) => services.AddTransient((_) => options.CreateHttpMessageHandler()))
+    .ConfigureServices(
+        (services) => services.AddTransient((_) => options.CreateHttpMessageHandler()))
     .Build();
 
 server.Start();

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: 1.2.0.{build}
+version: 1.2.1.{build}
 
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

samples/SampleApp.Tests/ReposTests.cs

@@ -39,22 +39,19 @@ public async Task Can_Get_Organization_Repositories()
             {
                 // Setup an expected response from the GitHub API
                 var builder = new HttpRequestInterceptionBuilder()
+                    .Requests()
                     .ForHttps()
                     .ForHost("api.github.com")
                     .ForPath("orgs/weyland-yutani/repos")
                     .ForQuery("per_page=2")
+                    .Responds()
                     .WithJsonContent(
                         new[]
                         {
                             new { id = 1, name = "foo" },
                             new { id = 2, name = "bar" },
-                        });
-
-                // Add a callback for when a request is intercepted
-                builder.WithInterceptionCallback(
-                    (request) => _outputHelper.WriteLine($"Intercepted HTTP {request.Method} {request.RequestUri}"));
-
-                _fixture.Interceptor.Register(builder);
+                        })
+                    .RegisterWith(_fixture.Interceptor);
 
                 string[] actual;
 

tests/HttpClientInterception.Tests/Examples.cs

@@ -25,12 +25,12 @@ public static class Examples
         public static async Task Intercept_Http_Get_For_Json_Object()
         {
             // Arrange
+            var options = new HttpClientInterceptorOptions();
+
             var builder = new HttpRequestInterceptionBuilder()
                 .Requests().ForGet().ForHttps().ForHost("public.je-apis.com").ForPath("terms")
-                .Responds().WithJsonContent(new { Id = 1, Link = "https://www.just-eat.co.uk/privacy-policy" });
-
-            var options = new HttpClientInterceptorOptions()
-                .Register(builder);
+                .Responds().WithJsonContent(new { Id = 1, Link = "https://www.just-eat.co.uk/privacy-policy" })
+                .RegisterWith(options);
 
             string json;