This commit is contained in:
Ricardo Tomasi 2013-05-23 11:00:45 -03:00
parent 1af28bc2ac
commit 76891afd08
2 changed files with 28 additions and 30 deletions

View File

@ -15,17 +15,17 @@
},
defaultSettings = {
title: 'My Blog',
description: ''
},
defaultSettings = {
title: 'My Blog',
description: ''
},
getSettings = function () {
return $.extend(defaultSettings, {
title : $('#blog-title').val(),
description : $('#blog-description').val()
});
};
getSettings = function () {
return $.extend(defaultSettings, {
title : $('#blog-title').val(),
description : $('#blog-description').val()
});
};
$(document).ready(function () {
if (location.hash) {

View File

@ -14,8 +14,8 @@
fixtures = require('../../shared/data/fixtures/001'),
api;
function fail (err) {
process.nextTick(function(){
function fail(err) {
process.nextTick(function () {
assert.ifError(err);
});
}
@ -24,7 +24,7 @@
setUp: function (done) {
// Clear database
var dbpath = path.resolve(__dirname, '../../../', config.database.testing.connection.filename);
fs.unlink(dbpath, function(){
fs.unlink(dbpath, function () {
// There is currently no way to tell when Ghost is loaded. api instantiates it's own `Ghost`
// which will run migrations without making the promise externally accessible
api = require('../../shared/api');
@ -37,30 +37,28 @@
test.expect(1);
api.settings.browse().then(function (settings) {
settings = _.map(settings.toJSON(), function (item) {
return _.omit(item, 'id', 'updated_at', 'created_at')
return _.omit(item, 'id', 'updated_at', 'created_at');
});
test.deepEqual(settings, fixtures.settings);
test.done();
}).then(null, fail);
},
// 'settings:read': function (test) {
// api.settings.read('title', function (setting) {
// console.log(setting);
// test.done();
// }).then(null, fail);
// },
'settings:read': function (test) {
api.settings.read('title', function (setting) {
test.done();
}).then(null, fail);
},
// 'settings:edit': function (test) {
// test.expect(2);
// api.settings.edit('title', "Jenna O'Neil").then(function (title) {
// title = title.toJSON();
// console.log('got title')
// test.equal(title.key, 'title');
// test.equal(title.value, "Jenna O'Neil");
// test.done();
// }).then(null, fail);
// }
'settings:edit': function (test) {
test.expect(2);
api.settings.edit('title', "Jenna O'Neil").then(function (title) {
title = title.toJSON();
test.equal(title.key, 'title');
test.equal(title.value, "Jenna O'Neil");
test.done();
}).then(null, fail);
}
};
}());