Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
yaonie084 committed Jun 21, 2016
1 parent c45abfd commit fa33fbf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 32 deletions.
35 changes: 14 additions & 21 deletions api/pages/pages.controller.js
Expand Up @@ -3,28 +3,21 @@ var _ = require('lodash');
var request = require('request');

exports.test = function(req, res) {
var login, password;
login = req.body.login;
password = req.body.password;
// ans = undefined;
// console.log(ans.body.ttt);
// console.log(ans.body);
// console.log(ans.body);
tripUser = req.body.tripUser;
location = req.body.location;

request.get('http://app.miaoyiapp.com/pages/test', function(err, res, body){
if (!err && res.statusCode == 200) {
console.log(body) // Show the HTML for the Google homepage.
if (!body)
return
}
else
{
console.log('error')
console.log(req.body);

if(tripUser == '张三') {
result = {
success: true
};
}else {
result = {
success: false
}
// console.log(res.body)
});
}

res.send(result);

res.send({
foo: "success"
});
};
16 changes: 5 additions & 11 deletions tests/test.js
Expand Up @@ -8,21 +8,15 @@ var pages = require('../api/pages/pages.controller');
describe("Routes", function() {
describe("test", function() {

it("should respond", function() {
var req,res,spy;

req = res = {body: {login: '123', password: '456'}};
spy = res.send = sinon.spy();
pages.test(req, res)
expect(spy.calledOnce).to.equal(true);
});

it("should respond a hash", function() {
var mockReq = {body: {login: '123', password: '456'}};
var mockReq = {body: {tripUser: '张三123', location: '北京'}};
var mockRes = {
send: function(res) {

// console.log(res);

res.should.exist;
res.should.eql({foo: 'success'});
res.should.eql({success: true});
}
};
pages.test(mockReq, mockRes)
Expand Down

0 comments on commit fa33fbf

Please sign in to comment.