Merge branch 'master' of github.com:SparkPost/node-sparkpost into wip…

…-2.0.0
SparkPost · Apr 25, 2016 · 4290f5a · 4290f5a
2 parents 876b6bf + cf092a9
commit 4290f5a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Change Log
 
+### v1.3.3 (2016/04/25)
+- [#142](https://github.com/SparkPost/node-sparkpost/pull/142) Upgrade request to 2.72.0 and fix affected test (@artlogic)
+
 ### v1.3.2 (2016/04/13)
 - [#139](https://github.com/SparkPost/node-sparkpost/pull/139) Make Gruntfile.js cross-platform friendly (@coldacid)
 - [#137](https://github.com/SparkPost/node-sparkpost/pull/137) Fix missing `subaccounts` property in SparkPost class (@coldacid)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sparkpost",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A Node.js wrapper for interfacing with your favorite SparkPost APIs",
   "main": "./lib/sparkpost.js",
   "scripts": {
@@ -42,6 +42,6 @@
   "dependencies": {
     "json-pointer": "^0.5.0",
     "lodash": "^3.9.3",
-    "request": "2.42.0"
+    "request": "^2.72.0"
   }
 }
diff --git a/test/spec/sparkpost.spec.js b/test/spec/sparkpost.spec.js
@@ -198,6 +198,7 @@ describe('SparkPost Library', function() {
         , options = {
           method: 'GET'
           , uri: 'https://test.sparkpost.com/test'
+          , gzip: true
           , debug: true
         };
 
@@ -206,7 +207,7 @@ describe('SparkPost Library', function() {
         compressedMsg = gzipped;
         gzipNock = nock('https://test.sparkpost.com', {
             reqheaders: {
-              'accept-encoding': 'gzip'
+              'accept-encoding': /gzip/
             }
           })
           .get('/test')