Updating dev dependencies and unit tests, as well as fixing build settings to avoid warnings/errors

Author: Portugal, Marcelo

.travis.yml

@@ -1,14 +1,15 @@
 language: node_js
 
 node_js:
-  - 0.10
+  - 4.2.1
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - npm install --quiet -g grunt-cli karma bower protractor
   - npm install
   - bower install
+  - node ./node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update --standalone
   - node ./node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager start > /dev/null &
   - sleep 5
 

bower.json

@@ -1,7 +1,7 @@
 {
 	"name": "angular-gridster",
 	"version": "0.13.10",
-	"main": ["src/angular-gridster.js", "dist/angular-gridster.min.css"],
+	"main": ["src/angular-gridster.js", "src/angular-gridster.less"],
 	"dependencies": {
 		"angular": ">= 1.2.0",
 		"javascript-detect-element-resize": "~0.5.1"

karma.conf.js

@@ -56,7 +56,7 @@ module.exports = function(config) {
 		// - Safari (only Mac)
 		// - PhantomJS
 		// - IE (only Windows)
-		browsers: ['PhantomJS2'],
+		browsers: ['PhantomJS'],
 		// Continuous Integration mode
 		// if true, it capture browsers, run tests and exit
 		singleRun: false

package.json

@@ -6,31 +6,33 @@
 	"homepage": "http://manifestwebdesign.github.io/angular-gridster",
 	"authors": "https://github.com/ManifestWebDesign/angular-gridster/graphs/contributors",
 	"devDependencies": {
-		"grunt": "^0.4.5",
-		"grunt-bump": "0.0.14",
-		"grunt-contrib-concat": "~0.4.0",
-		"grunt-contrib-connect": "~0.7.1",
-		"grunt-contrib-jshint": "~0.10.0",
-		"grunt-contrib-less": "~0.11.0",
-		"grunt-contrib-uglify": "~0.4.0",
-		"grunt-contrib-watch": "~0.6.1",
-		"grunt-jsbeautifier": "^0.2.12",
-		"grunt-karma": "~0.8.3",
-		"grunt-protractor-runner": "~0.2.4",
-		"karma": "~0.12.16",
-		"karma-chrome-launcher": "~0.1.3",
-		"karma-coverage": "~0.2.1",
-		"karma-firefox-launcher": "~0.1.3",
-		"karma-jasmine": "~0.2.2",
-		"karma-mocha": "~0.1.3",
-		"karma-phantomjs2-launcher": "^0.4.0",
-		"karma-script-launcher": "~0.1.0",
-		"matchdep": "~0.3.0",
-		"mocha": "~1.19.0",
-		"time-grunt": "~0.3.1"
+		"grunt": "^1.0.1",
+		"grunt-bump": "0.8.0",
+		"grunt-contrib-concat": "~1.0.1",
+		"grunt-contrib-connect": "~1.0.2",
+		"grunt-contrib-jshint": "~1.0.0",
+		"grunt-contrib-less": "~1.3.0",
+		"grunt-contrib-uglify": "~1.0.1",
+		"grunt-contrib-watch": "~1.0.0",
+		"grunt-jsbeautifier": "^0.2.13",
+		"grunt-karma": "~2.0.0",
+		"grunt-protractor-runner": "~3.2.0",
+		"jasmine-core": "~2.4.1",
+		"karma": "~1.1.1",
+		"karma-chrome-launcher": "~1.0.1",
+		"karma-coverage": "~1.1.0",
+		"karma-firefox-launcher": "~1.0.0",
+		"karma-jasmine": "~1.0.2",
+		"karma-mocha": "~1.1.1",
+		"karma-phantomjs-launcher": "^1.0.0",
+		"karma-script-launcher": "~1.0.0",
+		"lodash": "~4.13.1",
+		"matchdep": "~1.0.1",
+		"mocha": "~2.5.3",
+		"time-grunt": "~1.3.0"
 	},
 	"engines": {
-		"node": ">=0.10.0"
+		"node": ">=4.2.1"
 	},
 	"scripts": {
 		"test": "grunt test",

test/e2e/gridster.js

@@ -36,7 +36,7 @@ describe('Controller: GridsterCtrl', function() {
 			expect(size.width).toBeGreaterThan(0);
 			width = size.width;
 		}).then(function() {
-			return firstItem.findElement(by.model('item.sizeX'));
+			return firstItem.element(by.model('item.sizeX'));
 		}).then(function(input) {
 			return input.sendKeys('2').then(function() {
 				input.sendKeys(protractor.Key.TAB);
@@ -49,17 +49,19 @@ describe('Controller: GridsterCtrl', function() {
 	});
 
 	it('should resize the row widths and heights', function() {
+		var initialSize;
+
 		browser.driver.manage().window().setSize(1200, 1200);
-		firstItem.getSize().then(function(size) {
-			expect(size.width).toBe(307);
-			expect(size.height).toBe(143);
-		});
-		//		.then(function() {
-		//			browser.driver.manage().window().setSize(1000, 1000);
-		//			firstItem.getSize().then(function(size) {
-		//				expect(size.width).toBe(271);
-		//				expect(size.height).toBe(126);
-		//			});
-		//		});
+		firstItem.getSize()
+			.then(function setInitialSize(size) {
+				initialSize = size;
+			})
+			.then(function() {
+				browser.driver.manage().window().setSize(1000, 1000);
+				firstItem.getSize().then(function(newSize) {
+					expect(newSize.width).toBeLessThan(initialSize.width);
+					expect(newSize.height).toBeLessThan(initialSize.height);
+				});
+			});
 	});
 });