From e1bef8e0aa919554552d4433b3b222d9bff51bc8 Mon Sep 17 00:00:00 2001 From: Mike North Date: Wed, 20 May 2015 18:13:22 -0700 Subject: [PATCH] Ember-cli 0.2.5 --- .editorconfig | 1 + .npmignore | 2 + .travis.yml | 16 ++++++- addon/mixins/route.js | 2 +- bower.json | 16 +++---- config/ember-try.js | 47 +++++++++++++++++++ package.json | 35 +++++++------- testem.json | 1 + .../infinity-route-with-meta-test.js | 12 ++--- tests/dummy/app/styles/app.css | 3 ++ tests/dummy/public/crossdomain.xml | 18 +++---- tests/dummy/public/robots.txt | 1 + tests/unit/mixins/route-test.js | 4 +- 13 files changed, 116 insertions(+), 42 deletions(-) create mode 100644 config/ember-try.js diff --git a/.editorconfig b/.editorconfig index 2fe4874a..47c54384 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,6 +18,7 @@ indent_style = space indent_size = 2 [*.hbs] +insert_final_newline = false indent_style = space indent_size = 2 diff --git a/.npmignore b/.npmignore index 0533b918..49996f5a 100644 --- a/.npmignore +++ b/.npmignore @@ -1,5 +1,7 @@ bower_components/ tests/ +tmp/ +dist/ .bowerrc .editorconfig diff --git a/.travis.yml b/.travis.yml index cf23938b..6f884725 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ --- language: node_js +node_js: + - "0.12" sudo: false @@ -7,7 +9,19 @@ cache: directories: - node_modules +env: + - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.10 + - EMBER_TRY_SCENARIO=ember-1.11 + - EMBER_TRY_SCENARIO=ember-release + - EMBER_TRY_SCENARIO=ember-beta + - EMBER_TRY_SCENARIO=ember-canary + +matrix: + fast_finish: true + before_install: + - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - "npm config set spin false" - "npm install -g npm@^2" @@ -17,4 +31,4 @@ install: - bower install script: - - npm test + - ember try $EMBER_TRY_SCENARIO test diff --git a/addon/mixins/route.js b/addon/mixins/route.js index c443ec44..9431bfa8 100644 --- a/addon/mixins/route.js +++ b/addon/mixins/route.js @@ -92,7 +92,7 @@ export default Ember.Mixin.create({ infinityModel: function(modelName, options) { var _this = this; - if (this.store === undefined){ + if (Ember.isEmpty(this.store) || Ember.isEmpty(this.store.find)){ throw new Ember.Error("Ember Data store is not available to infinityModel"); } else if (modelName === undefined) { throw new Ember.Error("You must pass a Model Name to infinityModel"); diff --git a/bower.json b/bower.json index b0b0c8f1..5a4ecd29 100644 --- a/bower.json +++ b/bower.json @@ -1,17 +1,17 @@ { "name": "ember-infinity", "dependencies": { - "jquery": "^1.11.1", "ember": "1.10.0", - "ember-data": "1.0.0-beta.15", - "ember-resolver": "~0.1.12", - "loader.js": "ember-cli/loader.js#3.2.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", - "ember-qunit": "0.2.8", + "ember-data": "1.0.0-beta.17", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", + "ember-qunit": "0.3.3", "ember-qunit-notifications": "0.0.7", - "qunit": "~1.17.1", - "pretender": "0.1.0" + "ember-resolver": "~0.1.15", + "jquery": "^1.11.1", + "loader.js": "ember-cli/loader.js#3.2.0", + "pretender": "0.6.0", + "qunit": "~1.17.1" } } diff --git a/config/ember-try.js b/config/ember-try.js new file mode 100644 index 00000000..009c2403 --- /dev/null +++ b/config/ember-try.js @@ -0,0 +1,47 @@ +module.exports = { + scenarios: [ + { + name: 'default', + dependencies: {} + }, + { + name: 'ember-1.10', + dependencies: { + 'ember': '~1.10.0' + } + }, + { + name: 'ember-1.11', + dependencies: { + 'ember': '~1.11.3' + } + }, + { + name: 'ember-release', + dependencies: { + 'ember': 'components/ember#release' + }, + resolutions: { + 'ember': 'release' + } + }, + { + name: 'ember-beta', + dependencies: { + 'ember': 'components/ember#beta' + }, + resolutions: { + 'ember': 'beta' + } + }, + { + name: 'ember-canary', + dependencies: { + 'ember': 'components/ember#canary' + }, + resolutions: { + 'ember': 'canary' + } + } + ] +}; diff --git a/package.json b/package.json index fcfb3708..0f09f335 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test" + "test": "ember try:testall" }, "repository": "https://github.com/hhff/ember-infinity", "engines": { @@ -17,28 +17,31 @@ }, "author": "Hugh Francis", "license": "MIT", - "dependencies": { - "ember-cli-htmlbars": "0.7.4", - "ember-cli-version-checker": "^1.0.2" - }, "devDependencies": { - "broccoli-asset-rev": "^2.0.0", - "ember-cli": "0.2.0", - "ember-cli-app-version": "0.3.2", - "ember-cli-babel": "^4.0.0", - "ember-cli-content-security-policy": "0.3.0", - "ember-cli-dependency-checker": "0.0.8", + "broccoli-asset-rev": "^2.0.2", + "ember-cli": "0.2.5", + "ember-cli-app-version": "0.3.3", + "ember-cli-content-security-policy": "0.4.0", + "ember-cli-dependency-checker": "^1.0.0", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-pretender": "0.3.1", - "ember-cli-qunit": "0.3.9", - "ember-cli-uglify": "1.0.1", - "ember-data": "1.0.0-beta.15", - "ember-export-application-global": "^1.0.2" + "ember-cli-pretender": "0.3.2", + "ember-cli-qunit": "0.3.13", + "ember-cli-version-checker": "^1.0.2", + "ember-cli-uglify": "^1.0.1", + "ember-data": "1.0.0-beta.17", + "ember-disable-proxy-controllers": "^0.7.0", + "ember-export-application-global": "^1.0.2", + "ember-disable-prototype-extensions": "^1.0.0", + "ember-try": "0.0.5" }, "keywords": [ "ember-addon" ], + "dependencies": { + "ember-cli-babel": "^5.0.0", + "ember-cli-htmlbars": "0.7.6" + }, "ember-addon": { "configPath": "tests/dummy/config" } diff --git a/testem.json b/testem.json index 42a4ddb2..0f35392c 100644 --- a/testem.json +++ b/testem.json @@ -1,6 +1,7 @@ { "framework": "qunit", "test_page": "tests/index.html?hidepassed", + "disable_watching": true, "launch_in_ci": [ "PhantomJS" ], diff --git a/tests/acceptance/infinity-route-with-meta-test.js b/tests/acceptance/infinity-route-with-meta-test.js index b7c81672..1f9e0c52 100644 --- a/tests/acceptance/infinity-route-with-meta-test.js +++ b/tests/acceptance/infinity-route-with-meta-test.js @@ -28,8 +28,8 @@ module('Acceptance: Infinity Route', { } else { subset = posts; } - perPage = parseInt(request.queryParams.per_page); - startPage = parseInt(request.queryParams.page); + perPage = parseInt(request.queryParams.per_page, 10); + startPage = parseInt(request.queryParams.page, 10); var pageCount = Math.ceil(subset.length / perPage); offset = perPage * (startPage - 1); @@ -69,9 +69,9 @@ test('it works with parameters', function(assert) { var postList = find('ul'); var infinityLoader = find('.infinity-loader'); - assert.equal(postsTitle.text(), "Listing Posts using Parameters"); - assert.equal(postList.find('li').length, 2); - assert.equal(postList.find('li:first-child').text(), "Squarepusher"); - assert.equal(infinityLoader.hasClass('reached-infinity'), false); + assert.equal(postsTitle.text(), "Listing Posts using Parameters", "Post title text is correct"); + assert.equal(postList.find('li').length, 2, "Two items should be in the list"); + assert.equal(postList.find('li:first-child').text(), "Squarepusher", "First item should be 'Squarepusher'"); + assert.equal(infinityLoader.hasClass('reached-infinity'), false, "Infinity should not yet have been reached"); }); }); diff --git a/tests/dummy/app/styles/app.css b/tests/dummy/app/styles/app.css index e69de29b..6d934965 100644 --- a/tests/dummy/app/styles/app.css +++ b/tests/dummy/app/styles/app.css @@ -0,0 +1,3 @@ +ul li { + height: 500px; +} diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml index 29a035d7..0c16a7a0 100644 --- a/tests/dummy/public/crossdomain.xml +++ b/tests/dummy/public/crossdomain.xml @@ -1,15 +1,15 @@ - + - - + + - - + + diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt index 5debfa4d..f5916452 100644 --- a/tests/dummy/public/robots.txt +++ b/tests/dummy/public/robots.txt @@ -1,2 +1,3 @@ # http://www.robotstxt.org User-agent: * +Disallow: diff --git a/tests/unit/mixins/route-test.js b/tests/unit/mixins/route-test.js index 9b9f8900..6816f7c7 100644 --- a/tests/unit/mixins/route-test.js +++ b/tests/unit/mixins/route-test.js @@ -36,7 +36,9 @@ test('it can not use infinityModel without a Model Name', function(assert) { } }); var route = RouteObject.create(); - route.store = {}; + route.store = { + find() {} + }; var infinityError; try {