fix tests, minor fixes

iliakan · iliakan · commit ebfaae284e8b · 2015-05-21T23:34:31.000+03:00
diff --git a/handlers/imgur/controllers/upload.js b/handlers/imgur/controllers/upload.js
@@ -1,8 +1,8 @@
-
 var multiparty = require('multiparty');
 var uploadStream = require('../lib/uploadStream');
 var co = require('co');
 var ImgurImage = require('../models/imgurImage');
+var BadImageError = require('../lib/badImageError');
 
 exports.post = function*() {
 
diff --git a/handlers/imgur/lib/transload.js b/handlers/imgur/lib/transload.js
@@ -14,6 +14,6 @@ module.exports = function*(url) {
     }
   });
 
-  yield ImgurImage.createFromResponse(response);
+  return yield ImgurImage.createFromResponse(response);
 };
 
diff --git a/handlers/imgur/test/server/upload.js b/handlers/imgur/test/server/upload.js
@@ -23,7 +23,7 @@ describe('imgur', function() {
     server.close();
   });
 
-  describe('POST /upload', function() {
+  describe('POST /imgur/upload', function() {
 
     it('returns id after uploading a valid image', function(done) {
       request(server)
@@ -33,7 +33,8 @@ describe('imgur', function() {
         .expect(200)
         .end(function(err, res) {
           if (err) return done(err);
-          res.body.id.should.exist;
+          res.body.imgurId.should.exist;
+          res.body.link.should.exist;
           done();
         });
     });
diff --git a/handlers/imgur/test/transload.js b/handlers/imgur/test/transload.js
@@ -12,7 +12,7 @@ describe("imgur", function() {
 
     it("works for a normal url", function*() {
       var response = yield* transload(urlExample);
-      response.should.be.string;
+      response.imgurId.should.be.string;
     });
 
 
diff --git a/handlers/users/test/api/id.js b/handlers/users/test/api/id.js
@@ -36,18 +36,7 @@ describe('Authorization', function() {
         });
     });
 
-    it('transloads the user photo', function(done) {
-      request(server)
-        .patch('/users/me')
-        .set('X-Test-User-Id', fixtures.User[0]._id)
-        .set('Accept', 'application/json')
-        .attach('photo', path.join(__dirname, 'me.jpg'))
-        .end(function(err, res) {
-          if (err) return done(err);
-          res.body.photo.should.startWith('http://');
-          done();
-        });
-    });
+    // todo: test for photoId submission
 
     it('returns not all errors, but only one error if a field is wrong', function(done) {
       request(server)
diff --git a/modules/deploy/tasks/build.js b/modules/deploy/tasks/build.js
@@ -13,23 +13,22 @@ module.exports = function() {
 
   var args = require('yargs')
     .example('gulp deploy:build --host nightly')
-    .example('gulp deploy:build --host nightly --npm')
+    .example('gulp deploy:build --host nightly --with-npm')
     .demand(['host'])
     .argv;
 
   return function() {
 
     return co(function*() {
 
-
       var client = yield* sshConnect(args.host);
 
       try {
         yield* client.runInBuild(`git reset --hard`);
         yield* client.runInBuild(`git fetch origin master`);
         yield* client.runInBuild(`git merge origin/master --no-edit`);
 
-        if (args.npm) {
+        if (args.withNpm) {
           yield* reinstallModules();
         }
 
@@ -48,7 +47,7 @@ module.exports = function() {
 
       function* reinstallModules() {
         yield* client.runInBuild(`rm -rf node_modules`);
-        yield* client.runInBuild(`npm install`);
+        yield* client.runInBuild(`npm install --no-spin --node-gyp=pangyp`);
         yield* client.runInBuild('git add --force node_modules');
       }
 
diff --git a/modules/deploy/tasks/update.js b/modules/deploy/tasks/update.js
@@ -23,6 +23,9 @@ module.exports = function() {
       var client = yield* sshConnect(args.host);
 
       try {
+        // make sure tests pass
+        yield client.runInBuild(`npm test`);
+
         yield* client.runInTarget(`git reset --hard`);
         yield* client.runInTarget(`git fetch origin production`);
         yield* client.runInTarget(`git merge origin/production --no-edit`);
diff --git a/nginx/http/geoip.conf b/nginx/http/geoip.conf
@@ -1,7 +1,7 @@
 
 geoip_country         <%=nginxPrefix%>/geoip.dat;
 geoip_proxy           192.168.0.0/16;
-geoip_proxy           10.10.0.0/8;
+geoip_proxy           10.0.0.0/8;
 geoip_proxy           127.0.0.0/16;
 geoip_proxy_recursive on;
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ module.exports = function*(url) {`
`14`	`14`	`}`
`15`	`15`	`});`
`16`	`16`
`17`		`- yield ImgurImage.createFromResponse(response);`
	`17`	`+ return yield ImgurImage.createFromResponse(response);`
`18`	`18`	`};`
`19`	`19`