Skip to content

Commit

Permalink
Merge pull request #12 from ro-ka/fixes
Browse files Browse the repository at this point in the history 
oops :)
  • Loading branch information
@gleero
gleero committed Dec 5, 2013
2 parents a746bc6 + fe9f599 commit 5102806
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion tasks/favicons.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ module.exports = function(grunt) {
}

if (updateFirefoxManifest) {
contentFirefox.icons[size] = options.HTMLPrefix + 'firefox-icon' + dimensions + '.png';
contentFirefox.icons[size] = options.HTMLPrefix + fifname;
}

grunt.log.ok();
Expand Down
18 changes: 9 additions & 9 deletions test/test_stage1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports.favicons = {
icoExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/favicon.ico");
test.ok(exists, 'favicon.ico is not exists.');
test.ok(exists, 'favicon.ico does not exist.');
test.done();
},

Expand All @@ -28,7 +28,7 @@ exports.favicons = {
pngExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/favicon.png");
test.ok(exists, 'favicon.png is not exists.');
test.ok(exists, 'favicon.png does not exist.');
test.done();
},

Expand All @@ -45,7 +45,7 @@ exports.favicons = {
atiExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon.png");
test.ok(exists, 'apple-touch-icon.png is not exists.');
test.ok(exists, 'apple-touch-icon.png does not exist.');
test.done();
},

Expand All @@ -62,7 +62,7 @@ exports.favicons = {
atipExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-precomposed.png");
test.ok(exists, 'apple-touch-icon-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-precomposed.png does not exist.');
test.done();
},

Expand All @@ -79,7 +79,7 @@ exports.favicons = {
atip72Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-72x72-precomposed.png");
test.ok(exists, 'apple-touch-icon-72x72-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-72x72-precomposed.png does not exist.');
test.done();
},

Expand All @@ -96,7 +96,7 @@ exports.favicons = {
atip114Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-114x114-precomposed.png");
test.ok(exists, 'apple-touch-icon-114x114-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-114x114-precomposed.png does not exist.');
test.done();
},

Expand All @@ -113,7 +113,7 @@ exports.favicons = {
atip120Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-120x120-precomposed.png");
test.ok(exists, 'apple-touch-icon-120x120-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-120x120-precomposed.png does not exist.');
test.done();
},

Expand All @@ -130,7 +130,7 @@ exports.favicons = {
atip144Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-144x144-precomposed.png");
test.ok(exists, 'apple-touch-icon-144x144-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-144x144-precomposed.png does not exist.');
test.done();
},

Expand All @@ -147,7 +147,7 @@ exports.favicons = {
wt144Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/windows-tile-144x144.png");
test.ok(exists, 'windows-tile-144x144.png is not exists.');
test.ok(exists, 'windows-tile-144x144.png does not exist.');
test.done();
},

Expand Down
32 changes: 16 additions & 16 deletions test/test_stage2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports.favicons = {
icoExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/favicon.ico");
test.ok(exists, 'favicon.ico is not exists.');
test.ok(exists, 'favicon.ico does not exist.');
test.done();
},

Expand All @@ -29,7 +29,7 @@ exports.favicons = {
pngExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/favicon.png");
test.ok(exists, 'favicon.png is not exists.');
test.ok(exists, 'favicon.png does not exist.');
test.done();
},

Expand All @@ -46,7 +46,7 @@ exports.favicons = {
atiExists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon.png");
test.ok(exists, 'apple-touch-icon.png is not exists.');
test.ok(exists, 'apple-touch-icon.png does not exist.');
test.done();
},

Expand All @@ -63,7 +63,7 @@ exports.favicons = {
ati72Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-72x72.png");
test.ok(exists, 'apple-touch-icon-72x72.png is not exists.');
test.ok(exists, 'apple-touch-icon-72x72.png does not exist.');
test.done();
},

Expand All @@ -80,7 +80,7 @@ exports.favicons = {
ati114Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-114x114.png");
test.ok(exists, 'apple-touch-icon-114x114.png is not exists.');
test.ok(exists, 'apple-touch-icon-114x114.png does not exist.');
test.done();
},

Expand All @@ -97,7 +97,7 @@ exports.favicons = {
ati120Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-120x120-precomposed.png");
test.ok(exists, 'apple-touch-icon-120x120-precomposed.png is not exists.');
test.ok(exists, 'apple-touch-icon-120x120-precomposed.png does not exist.');
test.done();
},

Expand All @@ -114,7 +114,7 @@ exports.favicons = {
ati144Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/apple-touch-icon-144x144.png");
test.ok(exists, 'apple-touch-icon-144x144.png is not exists.');
test.ok(exists, 'apple-touch-icon-144x144.png does not exist.');
test.done();
},

Expand All @@ -131,7 +131,7 @@ exports.favicons = {
fx16Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-16x16.png");
test.ok(exists, 'firefox-icon-16x16.png is not exists.');
test.ok(exists, 'firefox-icon-16x16.png does not exist.');
test.done();
},

Expand All @@ -148,7 +148,7 @@ exports.favicons = {
fx30Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-30x30.png");
test.ok(exists, 'firefox-icon-30x30.png is not exists.');
test.ok(exists, 'firefox-icon-30x30.png does not exist.');
test.done();
},

Expand All @@ -165,7 +165,7 @@ exports.favicons = {
fx32Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-32x32.png");
test.ok(exists, 'firefox-icon-32x32.png is not exists.');
test.ok(exists, 'firefox-icon-32x32.png does not exist.');
test.done();
},

Expand All @@ -182,7 +182,7 @@ exports.favicons = {
fx48Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-48x48.png");
test.ok(exists, 'firefox-icon-48x48.png is not exists.');
test.ok(exists, 'firefox-icon-48x48.png does not exist.');
test.done();
},

Expand All @@ -199,7 +199,7 @@ exports.favicons = {
fx60Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-60x60.png");
test.ok(exists, 'firefox-icon-60x60.png is not exists.');
test.ok(exists, 'firefox-icon-60x60.png does not exist.');
test.done();
},

Expand All @@ -216,7 +216,7 @@ exports.favicons = {
fx64Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-64x64.png");
test.ok(exists, 'firefox-icon-64x64.png is not exists.');
test.ok(exists, 'firefox-icon-64x64.png does not exist.');
test.done();
},

Expand All @@ -233,7 +233,7 @@ exports.favicons = {
fx128Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-128x128.png");
test.ok(exists, 'firefox-icon-128x128.png is not exists.');
test.ok(exists, 'firefox-icon-128x128.png does not exist.');
test.done();
},

Expand All @@ -250,7 +250,7 @@ exports.favicons = {
fx256Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/firefox-icon-256x256.png");
test.ok(exists, 'firefox-icon-256x256.png is not exists.');
test.ok(exists, 'firefox-icon-256x256.png does not exist.');
test.done();
},

Expand All @@ -267,7 +267,7 @@ exports.favicons = {
manifestsum: function(test) {
test.expect(1);
var original = crypto.createHash('sha1').update(grunt.file.read(path + '/manifest.webapp')).digest('hex');
test.ok(original === '3d66ae4293edb4efba5dd85869d23f8260c30c67', 'firefox manifest hashsum not valid');
test.ok(original === 'e4bbb42a563f9b32f565817d8f3cdbe4d6518eb3', 'firefox manifest hashsum not valid');
test.done();
},

Expand Down
4 changes: 2 additions & 2 deletions test/test_stage3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports.favicons = {
wt144Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/windows-tile-144x144.png");
test.ok(exists, 'windows-tile-144x144.png is not exists.');
test.ok(exists, 'windows-tile-144x144.png does not exist.');
test.done();
},

Expand All @@ -30,7 +30,7 @@ exports.favicons = {
ci228Exists: function(test) {
test.expect(1);
var exists = fs.existsSync(path + "/coast-icon-228x228.png");
test.ok(exists, 'coast-icon-228x228.png is not exists.');
test.ok(exists, 'coast-icon-228x228.png does not exist.');
test.done();
},

Expand Down

0 comments on commit 5102806

Please sign in to comment.