From f8bb2874e47e726e798200e1ae4482e476dfd8d8 Mon Sep 17 00:00:00 2001 From: Rob Fletcher Date: Thu, 8 Aug 2013 18:22:41 +0100 Subject: [PATCH] Revert "#66 ignore failing tests until HTTPS works" This reverts commit 306b2337908d6a943e680b2860518d98e3a57f33. --- .../src/test/groovy/co/freeside/betamax/SmokeSpec.groovy | 1 - .../co/freeside/betamax/compatibility/HttpClientSpec.groovy | 1 - .../betamax/compatibility/HttpURLConnectionSpec.groovy | 1 - .../groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy | 3 +-- .../betamax/proxy/CustomSecureSocketFactorySpec.groovy | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/betamax-proxy/src/test/groovy/co/freeside/betamax/SmokeSpec.groovy b/betamax-proxy/src/test/groovy/co/freeside/betamax/SmokeSpec.groovy index 4f52a0f6..ab331b8c 100644 --- a/betamax-proxy/src/test/groovy/co/freeside/betamax/SmokeSpec.groovy +++ b/betamax-proxy/src/test/groovy/co/freeside/betamax/SmokeSpec.groovy @@ -60,7 +60,6 @@ class SmokeSpec extends Specification { uri = 'http://httpbin.org/redirect/1' } - @Ignore("until HTTPS support implemented") @Betamax(tape = 'smoke spec') void 'https proxying'() { setup: diff --git a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClientSpec.groovy b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClientSpec.groovy index ff1c4a6f..f2743bab 100644 --- a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClientSpec.groovy +++ b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClientSpec.groovy @@ -75,7 +75,6 @@ class HttpClientSpec extends Specification { response.getFirstHeader(VIA)?.value == 'Betamax' } - @Ignore("until HTTPS support implemented") @Betamax(tape = 'http client spec') void 'proxy can intercept HTTPS requests'() { given: diff --git a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpURLConnectionSpec.groovy b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpURLConnectionSpec.groovy index 1180286b..070d69ec 100644 --- a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpURLConnectionSpec.groovy +++ b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpURLConnectionSpec.groovy @@ -38,7 +38,6 @@ class HttpURLConnectionSpec extends Specification { connection.disconnect() } - @Ignore("until HTTPS support implemented") @Betamax(tape = 'http url connection spec', mode = WRITE_ONLY) void 'proxy intercepts HTTPS requests'() { when: diff --git a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy index 6f9203d5..a6394948 100644 --- a/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy +++ b/betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy @@ -38,8 +38,7 @@ class WsLiteSpec extends Specification { response.headers[X_BETAMAX] == 'REC' } - @Ignore("until HTTPS support implemented") -// @IgnoreIf({ javaVersion >= 1.6 && javaVersion < 1.7 }) + @IgnoreIf({ javaVersion >= 1.6 && javaVersion < 1.7 }) @Betamax(tape = 'wslite spec') void 'proxy intercepts HTTPS requests'() { given: 'a properly configured wslite instance' diff --git a/betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/CustomSecureSocketFactorySpec.groovy b/betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/CustomSecureSocketFactorySpec.groovy index 24a3bccb..ad89d9e0 100644 --- a/betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/CustomSecureSocketFactorySpec.groovy +++ b/betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/CustomSecureSocketFactorySpec.groovy @@ -40,7 +40,6 @@ class CustomSecureSocketFactorySpec extends Specification { BetamaxHttpsSupport.configure(http) } - @Ignore("until HTTPS support implemented") void 'proxy can use a custom SSL socket factory'() { given: 'a recorder configured with a custom SSL socket factory'