Merge pull request #290 from fieg/travis-fix2

Fixes and tweaks

Author: fieg

.travis.yml

@@ -1,12 +1,13 @@
 sudo: false
 
 addons:
-  firefox: latest
+  firefox: 53.0
 
 before_script:
   - npm install -g bower
   - bower install --production
   - bower install --force jquery#$JQUERY_VERSION
+  - ./node_modules/.bin/grunt build
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - sleep 5

src/callbacks.js

@@ -7,11 +7,12 @@
  * Copyright 2014-2016 Webcreate (Jeroen Fiege)
  */
 
-var IASCallbacks = function ($) {
+var IASCallbacks = function (aJquery) {
   this.list = [];
   this.fireStack = [];
   this.isFiring = false;
   this.isDisabled = false;
+  this.Deferred = aJquery.Deferred;
 
   /**
    * Calls all added callbacks
@@ -129,7 +130,7 @@ IASCallbacks.prototype = {
    * @returns {object|void}
    */
   fireWith: function (context, args) {
-    var deferred = $.Deferred();
+    var deferred = this.Deferred();
 
     if (this.isDisabled) {
       return deferred.reject();

src/extension/history.js

@@ -15,7 +15,7 @@ var IASHistoryExtension = function (options) {
   this.prevSelector = options.prev;
   this.prevUrl = null;
   this.listeners = {
-    prev: new IASCallbacks()
+    prev: new IASCallbacks(jQuery)
   };
 
   /**

src/extension/paging.js

@@ -14,7 +14,7 @@ var IASPagingExtension = function() {
   this.lastPageNum = 1;
   this.enabled = true;
   this.listeners = {
-    pageChange: new IASCallbacks()
+    pageChange: new IASCallbacks(jQuery)
   };
 
   /**

test/00-callbacks-test.js

@@ -4,7 +4,7 @@ describe("Callbacks", function () {
   });
 
   it("can add callback", function() {
-    var callbacks = new IASCallbacks(),
+    var callbacks = new IASCallbacks(jQuery),
         spy1 = this.spy();
 
     expect(callbacks.has(spy1)).toBeFalse();
@@ -15,7 +15,7 @@ describe("Callbacks", function () {
   });
 
   it("can remove callback", function() {
-    var callbacks = new IASCallbacks(),
+    var callbacks = new IASCallbacks(jQuery),
         spy1 = this.spy();
 
     callbacks.add(spy1);
@@ -28,7 +28,7 @@ describe("Callbacks", function () {
   });
 
   it("can fire callback", function() {
-    var callbacks = new IASCallbacks(),
+    var callbacks = new IASCallbacks(jQuery),
         spy1 = this.spy(),
         spy2 = this.spy();
 
@@ -42,7 +42,7 @@ describe("Callbacks", function () {
   });
 
   it("can be enabled/disabled", function() {
-    var callbacks = new IASCallbacks(),
+    var callbacks = new IASCallbacks(jQuery),
         spy1 = this.spy(),
         spy2 = this.spy();
 
@@ -65,7 +65,7 @@ describe("Callbacks", function () {
   });
 
   it("can add callback with priority", function() {
-    var callbacks = new IASCallbacks(),
+    var callbacks = new IASCallbacks(jQuery),
         lastedCalledSpy = null,
         spy1 = function() { lastedCalledSpy = "spy1"; },
         spy2 = function() { lastedCalledSpy = "spy2"; };

test/03-extensions-test.js

@@ -65,7 +65,7 @@ describe("IAS", function () {
   it("extension can add listeners", function() {
     var anExtension = function() {
       this.listeners = {
-        test: new IASCallbacks()
+        test: new IASCallbacks(jQuery)
       };
     };
 

test/04-history-extension-test.js

@@ -23,6 +23,8 @@ describe("IAS", function () {
       prev: '.prev-posts a'
     }));
 
+    ias.initialize();
+
     expect(ias.prev).toBeDefined();
   });
 

test/04-trigger-extension-test.js

@@ -24,6 +24,8 @@ describe("IAS", function () {
       html: '<div class="ias-trigger extra-trigger-class">{text}</div>'
     }));
 
+    jQuery.ias().initialize();
+
     expect($('.ias-trigger:visible').length).toEqual(0); // ensure it isn't already there
 
     scrollDown().then(function() {

test/06-ajax-test.js

@@ -15,10 +15,12 @@ describe("IAS", function () {
 
     ias.extension(new IASSpinnerExtension());
     ias.extension(new IASNoneLeftExtension());
+
+    ias.initialize();
   });
 
   after(function() {
-    ias.destroy();
+    jQuery.ias('destroy');
   });
 
   it("should keep working when items container gets updated", function() {

test/buster.js

@@ -17,13 +17,14 @@ config["My tests"] = {
     "bower_components/jquery/" + bower.jquery.main.replace(/^\.\//, ''),
   ],
   sources: [
-    "src/callbacks.js",
-    "src/jquery-ias.js",
-    "src/extension/paging.js",
-    "src/extension/spinner.js",
-    "src/extension/trigger.js",
-    "src/extension/noneleft.js",
-    "src/extension/history.js"
+    "dist/jquery-ias.min.js",
+    // "src/callbacks.js",
+    // "src/jquery-ias.js",
+    // "src/extension/paging.js",
+    // "src/extension/spinner.js",
+    // "src/extension/trigger.js",
+    // "src/extension/noneleft.js",
+    // "src/extension/history.js"
   ],
   resources: [
     { path: "/",            file: "test/fixtures/page1.html" },