Merge branch 'fix-404' of https://github.com/oncletom/Imager.js into …

…oncletom-fix-404

karma.conf.js

@@ -20,7 +20,6 @@ module.exports = function(config) {
       'Imager.js',
       'test/*.js',
       'test/unit/**/*.js',
-      { 'pattern': 'Demo - Grunt/Assets/Images/**/*.jpg', 'included': false, 'served': true },
       { 'pattern': 'test/fixtures/**/*.jpg', 'included': false, 'served': true },
       { 'pattern': 'test/fixtures/oldformat/*', 'included': false, 'served': true }
     ],

package.json

@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "grunt": "~0.4.1",
-    "grunt-responsive-images": "0.0.3",
+    "grunt-responsive-images": "~0.0.7",
     "karma-chai": "0.0.2",
     "karma-mocha": "~0.1.0",
     "chai": "~1.8.1",

test/fixtures/data-src-interpolate.html

@@ -1,4 +1,4 @@
-<div class="delayed-image-load" data-src="//farm5.staticflickr.com/4148/4990539658_a38ed4ec6e_{width}.jpg"></div>
-<div class="delayed-image-load" data-src="//farm4.staticflickr.com/3773/9676470682_3d418eeb40_{width}.jpg" data-width="640"></div>
-<div class="delayed-image-load" data-src="http://www.fillmurray.com/{width}/{width}" data-width="1024"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/interpolated/B-{width}.jpg"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/interpolated/B-{width}.jpg" data-width="640"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/{width}/{width}.jpg" data-width="1024"></div>
 

test/fixtures/data-src-new.html

@@ -1,3 +1,3 @@
-<div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/C-{width}.jpg"></div>
-<div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/B-{width}.jpg" data-width="640"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/media/C-{width}.jpg"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/media/B-{width}.jpg" data-width="640"></div>
 <div class="delayed-image-load" data-src="base/test/fixtures/media-{width}/fillmurray.jpg" data-width="320"></div>

test/fixtures/regular.html

@@ -1,13 +1,13 @@
-<div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/A-320.jpg"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/media/A-320.jpg"></div>
 
 <main id="main">
-  <div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/A-320.jpg"></div>
-  <div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/B-320.jpg" data-alt="Responsive Image alternative" data-width="640"></div>
-  <div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/C-320.jpg"></div>
+  <div class="delayed-image-load" data-src="base/test/fixtures/media/A-320.jpg"></div>
+  <div class="delayed-image-load" data-src="base/test/fixtures/media/B-320.jpg" data-alt="Responsive Image alternative" data-width="640"></div>
+  <div class="delayed-image-load" data-src="base/test/fixtures/media/C-320.jpg"></div>
 
   <div class="not-delayed-image-load">
     <img src="data:image/gif;base64,R0lGODlhEAAJAIAAAP///wAAACH5BAEAAAAALAAAAAAQAAkAAAIKhI+py+0Po5yUFQA7" alt="Not a responsive image">
   </div>
 </main>
 
-<div class="delayed-image-load" data-src="base/Demo - Grunt/Assets/Images/Generated/A-320.jpg"></div>
+<div class="delayed-image-load" data-src="base/test/fixtures/media/A-320.jpg"></div>

test/unit/html-options.js

@@ -35,8 +35,8 @@ describe('Imager.js HTML data-* API', function(){
         var src = imgr.divs.map(function(el){ return el.getAttribute('src'); });
 
         expect(src).to.eql([
-          'base/Demo - Grunt/Assets/Images/Generated/C-320.jpg',
-          'base/Demo - Grunt/Assets/Images/Generated/B-640.jpg',
+          'base/test/fixtures/media/C-320.jpg',
+          'base/test/fixtures/media/B-640.jpg',
           'base/test/fixtures/media-320/fillmurray.jpg'
         ]);
 
@@ -52,9 +52,9 @@ describe('Imager.js HTML data-* API', function(){
         var src = imgr.divs.map(function(el){ return el.getAttribute('src'); });
 
         expect(src).to.eql([
-          '//farm5.staticflickr.com/4148/4990539658_a38ed4ec6e_n_d.jpg',
-          '//farm4.staticflickr.com/3773/9676470682_3d418eeb40_z_d.jpg',
-          'http://www.fillmurray.com/1024/1024'
+          'base/test/fixtures/interpolated/B-n_d.jpg',
+          'base/test/fixtures/interpolated/B-z_d.jpg',
+          'base/test/fixtures/1024/1024.jpg'
         ]);
 
         done();