Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions Sinon.js.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
var test = require('unit.js');

function once(fn) {
var returnValue;
var called = false;
return function() {
if (!called) {
called = true;
returnValue = fn.apply(this, arguments);
}
return returnValue;
};
};
var jQuery = {
ajax: function() {}
};
function getTodos(listId, callback) {
jQuery.ajax({
url: '/todo/' + listId + '/items',
success: function(data) {
// Node-style CPS: callback(err, data)
callback(null, data);
}
});
}
11 changes: 11 additions & 0 deletions calculator.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,16 @@ function substract(num1, num2){
return num1 - num2;
}

function multiplicate(num1, num2){
return num1 * num2;
}

function divide(num1, num2){
return num1 / num2;
}

module.exports.add = add;
module.exports.substract = substract;
module.exports.multiplicate = multiplicate;
module.exports.divide = divide;
module.exports.isNumber = isNumber;
2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ <h1>Silly Calculator</h1>
<select id="operator" size="1">
<option value="add">+</option>
<option value="substract">-</option>
<option value="multiplicate">*</option>
<option value="divide">/</option>
</select>
<input type="text" id="num2" value="1" />
<div>=</div>
Expand Down
6 changes: 6 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ window.onload = function(){
else if (operator == "substract"){
document.getElementById('ans').value = substract(num1, num2);
}
else if (operator == "multiplicate"){
document.getElementById('ans').value = multiplicate(num1, num2);
}
else if (operator == "divide"){
document.getElementById('ans').value = divide(num1, num2);
}
else {
alert("Bad operator!")
}
Expand Down
17 changes: 17 additions & 0 deletions test/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
43 changes: 43 additions & 0 deletions test/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
26 changes: 25 additions & 1 deletion test/test_calculator.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
var assert = require('assert');
var cal = require('../calculator.js')


describe('Calculator', function(){
describe('add', function(){
it('add', function(){
assert.equal('2', cal.add(1, 1));
})
})
})
describe('substract', function(){
it('substract', function(){
assert.equal('0', cal.substract(1, 1));
})
})
describe('multiplicate', function(){
it('multiplicate', function(){
assert.equal('1', cal.multiplicate(1, 1));
})
})
describe('divide', function(){
it('divide', function(){
assert.equal('1', cal.divide(1, 1));
})
})
describe('returnvalue', function(){
it("returns the return value from the original function", function () {
var callback = sinon.stub().returns(42);
var proxy = once(callback);
assert.equals(proxy(), 42);
})
})
});