Skip to content

Commit

Permalink
Upgrade content
Browse files Browse the repository at this point in the history
  • Loading branch information
esbanarango committed Oct 22, 2015
1 parent 104f998 commit 4355de9
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 42 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
18 changes: 0 additions & 18 deletions Brocfile.js

This file was deleted.

14 changes: 7 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "ember-credit-card",
"dependencies": {
"ember": "1.12.0",
"ember": "1.13.7",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-data": "1.0.0-beta.18",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-data": "1.13.8",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-mocha": "~0.7.0",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"ember-resolver": "~0.1.18",
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"card": "~1.0.0"
},
"devDependencies": {
"card": "~1.0.0"
}
}
}
19 changes: 19 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberApp(defaults, {
// Add options here
});

/*
This build file specifes the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

app.import('bower_components/card/lib/js/card.js');

return app.toTree();
};
29 changes: 16 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "ember-credit-card",
"version": "1.0.0",
"description": "Make your credit card form better in one line of code.",
"description": "Make your credit card form better with one line of code.",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"start": "ember server",
"build": "ember build",
"start": "ember server",
"test": "ember try:testall"
},
"repository": "https://github.com/esbanarango/ember-credit-card",
Expand All @@ -18,18 +18,21 @@
"author": "Esteban Arango Medina",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "0.2.7",
"ember-cli-app-version": "0.3.3",
"ember-cli-dependency-checker": "^1.0.0",
"broccoli-asset-rev": "^2.1.2",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.5.0",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-mocha": "^0.6.1",
"ember-cli-uglify": "^1.0.1",
"ember-data": "1.0.0-beta.18",
"ember-cli-release": "0.2.3",
"ember-cli-sri": "^1.0.3",
"ember-cli-uglify": "^1.2.0",
"ember-data": "1.13.8",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.2",
"ember-export-application-global": "^1.0.3",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-try": "0.0.6"
},
Expand All @@ -40,9 +43,9 @@
],
"dependencies": {
"ember-cli-htmlbars": "0.7.9",
"ember-cli-babel": "^5.0.0"
"ember-cli-babel": "^5.1.3"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
3 changes: 2 additions & 1 deletion tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
3 changes: 2 additions & 1 deletion tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<h2 id="title">Welcome to Ember.js</h2>
<h2 id="title">Welcome to Ember</h2>

{{credit-card}}
{{outlet}}
1 change: 0 additions & 1 deletion tests/helpers/start-app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Ember from 'ember';
import Application from '../../app';
import Router from '../../router';
import config from '../../config/environment';

export default function startApp(attrs) {
Expand Down
1 change: 0 additions & 1 deletion tests/unit/components/credit-card-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ describeComponent(
component.set('values',{number:'nuuuumber'});
this.render();
card = component.get('card');
console.log(card);
expect(card.options.values.number).to.equal('nuuuumber');

});
Expand Down

0 comments on commit 4355de9

Please sign in to comment.