Skip to content

Allow messages without 'text' #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zldavis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow messages without 'text' #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed50d4
Allow messages without 'text'
zldavis Oct 2, 2014
c029fc8
with updated test
zldavis Oct 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions slack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function Slack(options) {
}

Slack.prototype.send = function(message,cb) {
if( !( message && message instanceof Object && message.text ) ) {
if( !( message && message instanceof Object && ( message.text || message.attachments ) ) ) {
if( cb && cb instanceof Function ) return cb(new Error('No message'));
return 'No message';
}
Expand All @@ -21,10 +21,10 @@ Slack.prototype.send = function(message,cb) {
var channel = message.channel || this.defaultChannel;
var options = {
channel: channel,
text: message.text,
username: message.username,
username: message.username
};

if( message.text ) options.text = message.text;
if( message.icon_emoji ) options.icon_emoji = message.icon_emoji;
if( message.icon_url ) options.icon_url = message.icon_url;
if( message.attachments ) options.attachments = message.attachments;
Expand Down
31 changes: 29 additions & 2 deletions test/testSlack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('test send', function(){
};
var expected = {
url: 'https://testing.slack.com/services/hooks/incoming-webhook?token=testToken',
body: '{"channel":"#test","text":"hello","username":"test","icon_emoji":"smile","attachments":[{"fallback":"hello","color":"good","fields":[{"title":"col 1","value":"hello 1","short":true},{"title":"col 2","value":"hello 2","short":true}]}]}'
body: '{"channel":"#test","username":"test","text":"hello","icon_emoji":"smile","attachments":[{"fallback":"hello","color":"good","fields":[{"title":"col 1","value":"hello 1","short":true},{"title":"col 2","value":"hello 2","short":true}]}]}'
};
request.post.callsArgWith(1, null, null, 'ok');
slack.send(input, function(err, res){
Expand All @@ -49,7 +49,7 @@ describe('test send', function(){
};
var expected = {
url: 'https://testing.slack.com/services/hooks/incoming-webhook?token=testToken',
body: '{"channel":"#general","text":"hello","username":"test","icon_url":"drnick.png"}'
body: '{"channel":"#general","username":"test","text":"hello","icon_url":"drnick.png"}'
};
request.post.callsArgWith(1, null, null, 'ok');
slack.send(input, function(err, res){
Expand All @@ -70,6 +70,33 @@ describe('test send', function(){
});
});

it('should allow messages with attachments without text', function(done){
var input = {
channel: '#test',
username: 'test',
icon_emoji: 'smile',
attachments : [{
fallback: 'hello',
color: 'good',
fields: [
{title: 'col 1', value: 'hello 1', short: true},
{title: 'col 2', value: 'hello 2', short: true}
]
}]
};
var expected = {
url: 'https://testing.slack.com/services/hooks/incoming-webhook?token=testToken',
body: '{"channel":"#test","username":"test","icon_emoji":"smile","attachments":[{"fallback":"hello","color":"good","fields":[{"title":"col 1","value":"hello 1","short":true},{"title":"col 2","value":"hello 2","short":true}]}]}'
};
request.post.callsArgWith(1, null, null, 'ok');
slack.send(input, function(err, res){
assert.ok(!err);
assert.equal(res, 'ok');
assert.deepEqual(request.post.getCall(0).args[0], expected);
done();
});
});

afterEach(function(){
request.post.restore();
});
Expand Down