fix(tests): Clean and better structured tests, no coffeescript.

Author: tombatossals

coffeelint.json

@@ -1,5 +1,5 @@
  {
-  "src": ["src/directives/*.js", "src/services/**/*.js"],
+  "src": ["src/directives/*.js", "src/services/**/*.js", "test/**/*.js"],
   "options": {
     "config": ".jscsrc",
     "fix": true

grunt/jscs.json

@@ -3,7 +3,7 @@
         "livereload": 7777
     },
     "fast": {
-        "files": [ "src/**/*.js", "test/unit/**.js", "test/unit/**.coffee", "test/e2e/**.js" ],
+        "files": [ "src/**/*.js", "test/unit/**.js", "test/e2e/**.js" ],
         "tasks": [ "fast-build" ]
     }
 }

grunt/watch.json

@@ -33,7 +33,6 @@
     "jasmine-core": "^2.2.0",
     "jsdom": "^7.0.2",
     "karma": "^0.13.15",
-    "karma-coffee-preprocessor": "^0.3.0",
     "karma-jasmine": "^0.3.6",
     "karma-phantomjs-launcher": "^0.2.1",
     "load-grunt-config": "^0.19.0",

package.json

@@ -34,5 +34,5 @@
               });
             },
           };
-        }, ]);
+        },]);
 });

src/directives/watchOptions.js

@@ -19,7 +19,7 @@ angular.module('leaflet-directive').service('leafletData', function($log, $q, le
       'geoJSON',
       'UTFGrid', //odd ball on naming convention keeping to not break
       'decorations',
-      'directiveControls', ];
+      'directiveControls',];
 
   //init
   _privateItems.forEach(function(itemName) {

src/services/leafletData.js

@@ -2,17 +2,17 @@
 
 describe('Loading 0100-basic-first-example.html', function() {
 
-    beforeEach(function() {
-        browser.get('0100-basic-first-example.html');
-        browser.wait(function() {
-            return element(by.css('img.leaflet-tile-loaded')).isPresent();
-        }, 5000);
-    }, 30000);
+  beforeEach(function() {
+    browser.get('0100-basic-first-example.html');
+    browser.wait(function() {
+      return element(by.css('img.leaflet-tile-loaded')).isPresent();
+    }, 5000);
+  }, 30000);
 
-    it('should load the Leaflet map inside the directive tag', function() {
-        element(by.className('angular-leaflet-map')).getText().then(function(text) {
-            expect(text).toBe("+\n-\nLeaflet | © OpenStreetMap contributors");
-        });
+  it('should load the Leaflet map inside the directive tag', function() {
+    element(by.className('angular-leaflet-map')).getText().then(function(text) {
+      expect(text).toBe('+\n-\nLeaflet | © OpenStreetMap contributors');
     });
+  });
 
 });

test/e2e/0100-basic-first-example.js

@@ -2,35 +2,36 @@
 
 describe('Loading 0101-basic-center-example.html', function() {
 
-    beforeEach(function() {
-        browser.get('0101-basic-center-example.html');
-        browser.wait(function() {
-            return element(by.css('img.leaflet-tile-loaded')).isPresent();
-        }, 5000);
-    }, 30000);
+  beforeEach(function() {
+    browser.get('0101-basic-center-example.html');
+    browser.wait(function() {
+      return element(by.css('img.leaflet-tile-loaded')).isPresent();
+    }, 5000);
+  }, 30000);
 
-    it('should update the zoom value in the input if clicked the zoom control', function() {
-        element(by.className('leaflet-control-zoom-in')).click();
-        // Wait for zoom animation
-        browser.driver.sleep(300);
-        expect(element(by.model("london.zoom")).getAttribute("value")).toBe('5');
-    });
+  it('should update the zoom value in the input if clicked the zoom control', function() {
+    element(by.className('leaflet-control-zoom-in')).click();
 
-    xit('should update the center value if the map is dragged', function() {
-        expect(element(by.model("london.lat")).getAttribute("value")).toBe('51.505');
-        expect(element(by.model("london.lng")).getAttribute("value")).toBe('-0.09');
-        var el = element(by.xpath('.//img[contains(@class, "leaflet-tile-loaded")][1]'));
-        var el2 = element(by.xpath('.//img[contains(@class, "leaflet-tile-loaded")][2]'));
-        browser.actions()
-                .mouseMove(el, {x: 5, y: 5})
-                .mouseDown()
-                .mouseMove(el2)
-                .mouseUp()
-                .perform();
+    // Wait for zoom animation
+    browser.driver.sleep(300);
+    expect(element(by.model('london.zoom')).getAttribute('value')).toBe('5');
+  });
 
-        browser.waitForAngular();
-        expect(element(by.model("london.lat")).getAttribute("value")).toBe('51.505');
-        expect(element(by.model("london.lng")).getAttribute("value")).toBe('-0.09');
-    });
+  xit('should update the center value if the map is dragged', function() {
+    expect(element(by.model('london.lat')).getAttribute('value')).toBe('51.505');
+    expect(element(by.model('london.lng')).getAttribute('value')).toBe('-0.09');
+    var el = element(by.xpath('.//img[contains(@class, "leaflet-tile-loaded")][1]'));
+    var el2 = element(by.xpath('.//img[contains(@class, "leaflet-tile-loaded")][2]'));
+    browser.actions()
+            .mouseMove(el, {x: 5, y: 5})
+            .mouseDown()
+            .mouseMove(el2)
+            .mouseUp()
+            .perform();
+
+    browser.waitForAngular();
+    expect(element(by.model('london.lat')).getAttribute('value')).toBe('51.505');
+    expect(element(by.model('london.lng')).getAttribute('value')).toBe('-0.09');
+  });
 
 });

test/e2e/0101-basic-center-example.js

@@ -2,37 +2,38 @@
 
 describe('Loading 0103-basic-center-url-hash-example.html', function() {
 
-    beforeEach(function() {
-        browser.get('0103-basic-center-url-hash-example.html');
-        browser.wait(function() {
-            return element(by.css('img.leaflet-tile-loaded')).isPresent();
-        }, 5000);
-    }, 30000);
+  beforeEach(function() {
+    browser.get('0103-basic-center-url-hash-example.html');
+    browser.wait(function() {
+      return element(by.css('img.leaflet-tile-loaded')).isPresent();
+    }, 5000);
+  }, 30000);
 
-    it('should update the url if the center value is changed from the form', function() {
-        element(by.xpath('//ul/li[1]/input[1]')).clear();
-        element(by.xpath('//ul/li[1]/input[1]')).sendKeys("9");
-        browser.driver.sleep(500);
-        element(by.xpath('//ul/li[2]/input[1]')).clear();
-        element(by.xpath('//ul/li[2]/input[1]')).sendKeys("7");
-        browser.driver.sleep(500);
-        element(by.xpath('//ul/li[3]/input[1]')).clear();
-        element(by.xpath('//ul/li[3]/input[1]')).sendKeys("4");
-        // Wait for zoom animation
-        browser.driver.sleep(1500);
-        expect(browser.driver.getCurrentUrl()).toMatch(/c=9.0153:6.9873:4$/);
-    });
+  it('should update the url if the center value is changed from the form', function() {
+    element(by.xpath('//ul/li[1]/input[1]')).clear();
+    element(by.xpath('//ul/li[1]/input[1]')).sendKeys('9');
+    browser.driver.sleep(500);
+    element(by.xpath('//ul/li[2]/input[1]')).clear();
+    element(by.xpath('//ul/li[2]/input[1]')).sendKeys('7');
+    browser.driver.sleep(500);
+    element(by.xpath('//ul/li[3]/input[1]')).clear();
+    element(by.xpath('//ul/li[3]/input[1]')).sendKeys('4');
 
-    it('should update the url if the zoom is changed from the map', function() {
-        element(by.xpath('.//*[@title="Zoom out"]')).click();
-        browser.driver.sleep(500);
-        expect(browser.getCurrentUrl()).toMatch(/51.5050:-0.0900:3/);
-    });
+    // Wait for zoom animation
+    browser.driver.sleep(1500);
+    expect(browser.driver.getCurrentUrl()).toMatch(/c=9.0153:6.9873:4$/);
+  });
 
-    it('should update the map center model if the url changes', function() {
-        element(by.xpath('//ul/li[1]/a[1]')).click();
-        expect(element(by.xpath('//ul/li[1]/input[1]')).getAttribute("value")).toBe("36.8899");
-        expect(element(by.xpath('//ul/li[2]/input[1]')).getAttribute("value")).toBe("-121.8008");
-        expect(element(by.xpath('//ul/li[3]/input[1]')).getAttribute("value")).toBe("12");
-    });
+  it('should update the url if the zoom is changed from the map', function() {
+    element(by.xpath('.//*[@title="Zoom out"]')).click();
+    browser.driver.sleep(500);
+    expect(browser.getCurrentUrl()).toMatch(/51.5050:-0.0900:3/);
+  });
+
+  it('should update the map center model if the url changes', function() {
+    element(by.xpath('//ul/li[1]/a[1]')).click();
+    expect(element(by.xpath('//ul/li[1]/input[1]')).getAttribute('value')).toBe('36.8899');
+    expect(element(by.xpath('//ul/li[2]/input[1]')).getAttribute('value')).toBe('-121.8008');
+    expect(element(by.xpath('//ul/li[3]/input[1]')).getAttribute('value')).toBe('12');
+  });
 });

test/e2e/0103-basic-center-url-hash-example.js

@@ -2,14 +2,14 @@
 
 describe('Loading 0104-basic-custom-parameters-example.html', function() {
 
-    beforeEach(function() {
-        browser.get('0104-basic-custom-parameters-example.html');
-        browser.wait(function() {
-            return element(by.css('img.leaflet-tile-loaded')).isPresent();
-        }, 5000);
-    });
+  beforeEach(function() {
+    browser.get('0104-basic-custom-parameters-example.html');
+    browser.wait(function() {
+      return element(by.css('img.leaflet-tile-loaded')).isPresent();
+    }, 5000);
+  });
 
-    it('should have loaded the opencyclemaps tiles', function() {
-        expect(element(by.css('img.leaflet-tile-loaded')).getAttribute("src")).toContain("tile.opencyclemap.org");
-    });
+  it('should have loaded the opencyclemaps tiles', function() {
+    expect(element(by.css('img.leaflet-tile-loaded')).getAttribute('src')).toContain('tile.opencyclemap.org');
+  });
 });