Skip to content

Commit

Permalink
Getting dummy app to run
Browse files Browse the repository at this point in the history
  • Loading branch information
Robdel12 committed May 13, 2015
1 parent fb890a0 commit 1afecc3
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 83 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bower_components/
tests/
tmp/

.bowerrc
.editorconfig
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
language: node_js
node_js:
- "0.12"

sudo: false

Expand Down
5 changes: 0 additions & 5 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@ var app = new EmberAddon();
app.import('bower_components/d3/d3.min.js');
app.import('bower_components/c3/c3.min.css');
app.import('bower_components/c3/c3.min.js');
app.import('bower_components/jsoneditor/jsoneditor.js');
app.import('bower_components/jsoneditor/jsoneditor.css');
app.import('bower_components/ember-jsoneditor/build/lib.js');
app.import('bower_components/ember-jsoneditor/build/lib.css');
app.import('bower_components/jsoneditor/img/jsoneditor-icons.png', {
destDir: 'assets/img'
});

// Use `app.import` to add additional libraries to the generated
// output files.
Expand Down
21 changes: 10 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"name": "ember-c3",
"dependencies": {
"handlebars": "~2.0.0",
"jquery": "^1.11.1",
"ember": "1.9.1",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember": "1.11.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.5",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-data": "1.0.0-beta.16.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.1",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1",
"c3": ">=0.1.43-0 < 1.0.0-0",
"d3": "~3.4.13",
"ember-jsoneditor": "~0.1.0"
"d3": "~3.4.13"
},
"devDependencies": {
"jsoneditor": "~3.1.2"
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = function(/* environment, appConfig */) {
return {}
return { };
};
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<base href="/" />
<meta name="dummy/config/environment" content="%7B%22modulePrefix%22%3A%22dummy%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
<meta name="dummy/config/environment" content="%7B%22modulePrefix%22%3A%22dummy%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22ember-c3%22%2C%22version%22%3A%220.0.1.fb890a0e%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
<script src="/ember-cli-live-reload.js" type="text/javascript"></script>
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="assets/vendor.css">
Expand Down
26 changes: 15 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test"
"test": "ember try:testall"
},
"repository": "https://github.com/Glavin001/ember-c3",
"engines": {
Expand All @@ -18,25 +18,29 @@
"author": "Glavin Wiechert",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.1.12",
"ember-cli-6to5": "0.2.1",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-github-pages": "0.0.3",
"ember-cli-htmlbars": "^0.6.0",
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.1.2",
"ember-export-application-global": "^1.0.0",
"express": "^4.8.5",
"glob": "^4.0.5"
"ember-cli-qunit": "0.3.10",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-try": "0.0.4",
"ember-watson": "^0.4.2"
},
"keywords": [
"ember-addon",
"C3",
"D3",
"C3 charts"
],
"dependencies": {
"ember-cli-babel": "^5.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
Expand Down
23 changes: 0 additions & 23 deletions tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,8 @@
"setTimeout",
"$",
"-Promise",
"QUnit",
"define",
"console",
"equal",
"notEqual",
"notStrictEqual",
"test",
"asyncTest",
"testBoth",
"testWithDefault",
"raises",
"throws",
"deepEqual",
"start",
"stop",
"ok",
"strictEqual",
"module",
"moduleFor",
"moduleForComponent",
"moduleForModel",
"process",
"expect",
"visit",
"exists",
"fillIn",
Expand All @@ -39,8 +18,6 @@
"findWithAssert",
"wait",
"DS",
"isolatedContainer",
"startApp",
"andThen",
"currentURL",
"currentPath",
Expand Down
4 changes: 3 additions & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;

Ember.MODEL_FACTORY_INJECTIONS = true;

var App = Ember.Application.extend({
App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Expand Down
4 changes: 1 addition & 3 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ var Router = Ember.Router.extend({
location: config.locationType
});

Router.map(function() {
export default Router.map(function() {
});

export default Router;
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
<a href="http://c3js.org/samples/chart_combination.html" target="_blank">Combination Chart</a>
in the <a href="http://c3js.org/examples.html" target="_blank">C3 examples</a>.
</p>
{{json-editor json=model}}
{{!json-editor json=model}}

</div>
16 changes: 0 additions & 16 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,6 @@
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/dummy.css">
<link rel="stylesheet" href="assets/test-support.css">
<style>
#ember-testing-container {
position: absolute;
background: white;
bottom: 0;
right: 0;
width: 640px;
height: 384px;
overflow: auto;
z-index: 9999;
border: 1px solid #ccc;
}
#ember-testing {
zoom: 50%;
}
</style>

{{content-for 'head-footer'}}
{{content-for 'test-head-footer'}}
Expand Down
6 changes: 0 additions & 6 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@ import {
} from 'ember-qunit';

setResolver(resolver);

document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');

QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
document.getElementById('ember-testing-container').style.visibility = containerVisibility;
8 changes: 4 additions & 4 deletions tests/unit/components/c3-chart-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ moduleForComponent('chart-component', 'ChartComponentComponent', {
// needs: ['component:foo', 'helper:bar']
});

test('it renders', function() {
expect(2);
test('it renders', function(assert) {
assert.expect(2);

// creates the component instance
var component = this.subject();
equal(component._state, 'preRender');
assert.equal(component._state, 'preRender');

// appends the component to the page
this.append();
equal(component._state, 'inDOM');
assert.equal(component._state, 'inDOM');
});

0 comments on commit 1afecc3

Please sign in to comment.