Clean up fixtures

digit-co · Jul 29, 2015 · 9fdadab · 9fdadab
1 parent 8a6f9bc
commit 9fdadab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/test/fixtures/index.coffee b/test/fixtures/index.coffee
@@ -11,35 +11,31 @@ oauth = ->
   nock("https://oauth.intuit.com:443")
     .filteringRequestBody((body) -> return "SAML")
     .post("/oauth/v1/get_access_token_by_saml", "SAML")
+    .matchHeader("Authorization", authorizationHeader)
     .reply(200, "oauth_token_secret=L63cI4q5UhP4mQzpCi1RHBMSLe2TNOaI98vxyIBL&oauth_token=qyprdcvDh5V2XoJRwYmxxdL5vOJ54Z6sNVohlNLQHyyhHaAy")
 
+jsonHeader = (header) ->
+  header is "application/json"
+
+signedHeader = (header) ->
+  /oauth_signature/.test header
+
+authorizationHeader = (header) ->
+  regex = new RegExp "#{config.consumerKey}"
+  regex.test header
+
 fixtures =
   oauth: oauth
 
-  # Fail the test if these headers aren't generated
   signedJson: ->
     oauth()
-    nock("https://financialdatafeed.platform.intuit.com:443", {
-      reqheaders:
-        "Content-Type": "application/json"
-        "Accept": "application/json"
-    })
+    nock("https://financialdatafeed.platform.intuit.com:443")
       .get("/v1/institutions/100000")
-      .matchHeader("Authorization", (header) ->
-        /oauth_signature/.test header
-      )
+      .matchHeader("Content-Type", jsonHeader)
+      .matchHeader("Accept", jsonHeader)
+      .matchHeader("Authorization", signedHeader)
       .reply(200, {})
 
-  signedSaml: ->
-    nock("https://oauth.intuit.com:443")
-      .filteringRequestBody((body) -> return "SAML")
-      .post("/oauth/v1/get_access_token_by_saml", "SAML")
-      .matchHeader("Authorization", (header) ->
-        regex = new RegExp "#{config.consumerKey}"
-        regex.test header
-      )
-      .reply(200, "oauth_token_secret=L63cI4q5UhP4mQzpCi1RHBMSLe2TNOaI98vxyIBL&oauth_token=qyprdcvDh5V2XoJRwYmxxdL5vOJ54Z6sNVohlNLQHyyhHaAy")
-
   getInstitutionDetails: ->
     oauth()
     load "getInstitutionDetails"

diff --git a/test/lib/oauth.coffee b/test/lib/oauth.coffee
@@ -8,7 +8,7 @@ fixture = require "../fixtures"
 describe "OAuth", ->
   describe "getToken", ->
     before -> @spy = bond(request, "post").through()
-    before -> fixture.load "signedSaml"
+    before -> fixture.load "oauth"
     before (done) ->
       oauth = new OAuth config
       oauth.getToken (@err, @token, @secret) =>