Merge pull request #57 from Dhaulagiri/br-modules

use new modules syntax

addon/components/markdown-to-html.js

@@ -1,19 +1,20 @@
-import Ember from 'ember';
+import { htmlSafe } from '@ember/string';
+import Component from '@ember/component';
+import { get, computed } from '@ember/object';
+import { merge, assign } from '@ember/polyfills';
+import { getOwner } from '@ember/application';
 import showdown from 'showdown';
 import layout from '../templates/components/markdown-to-html';
 
-const { computed, get, merge, getOwner } = Ember;
 const CONFIG_LOOKUP = 'config:environment';
 
-let assign = Ember.assign;
-
 if (!assign) {
   assign = function assignPolyfill(...objects) {
     return objects.reduce(merge);
   };
 }
 
-const ShowdownComponent = Ember.Component.extend({
+const ShowdownComponent = Component.extend({
   layout,
   markdown: '',
   _globalOptions: null,
@@ -45,7 +46,7 @@ const ShowdownComponent = Ember.Component.extend({
       }
     }
 
-    return Ember.String.htmlSafe(converter.makeHtml(get(this, 'markdown')));
+    return htmlSafe(converter.makeHtml(get(this, 'markdown')));
   }).readOnly(),
 
   converter: computed('extensions', function() {

tests/dummy/app/app.js

@@ -1,13 +1,11 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;
 
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

tests/dummy/app/router.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });

tests/helpers/destroy-app.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
-  Ember.run(application, 'destroy');
+  run(application, 'destroy');
 }

tests/helpers/module-for-acceptance.js

@@ -1,10 +1,8 @@
+import { Promise } from 'rsvp';
 import { module } from 'qunit';
-import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {

tests/helpers/start-app.js

@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
+import { merge } from '@ember/polyfills';
 import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  return Ember.run(() => {
+  return run(() => {
     let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();

tests/unit/components/markdown-to-html-test.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 import showdown from 'showdown';
 import { moduleForComponent, test } from 'ember-qunit';
 
@@ -18,7 +18,7 @@ test('it produces markdown', function(assert) {
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set('markdown', '##Hello, [world](#)');
   });
 
@@ -34,7 +34,7 @@ test('it inserts <br> tag', function(assert) {
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set('markdown', 'foo  \nbar');
   });
 
@@ -50,7 +50,7 @@ test('supports setting showdown options', function(assert) {
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set('markdown', '# title\nI ~~dislike~~ enjoy visiting http://www.google.com');
     component.set('simplifiedAutoLink', true);
     component.set('headerLevelStart', 3);
@@ -74,7 +74,7 @@ test('supports setting showdown options merged with global options', function(as
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set('markdown', '# title\nI ~~dislike~~ enjoy visiting http://www.google.com');
     component.set('headerLevelStart', 3);
     component.set('strikethrough', true);
@@ -101,7 +101,7 @@ test('it supports loading showdown extensions', function(assert) {
   let component = this.subject({ extensions: ['demo'] });
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set("markdown", "this is an ember showdown!");
   });
 
@@ -118,7 +118,7 @@ test('does not reset default showdown options with undefined', function(assert)
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set('markdown', '~~dislike~~');
   });
 
@@ -156,7 +156,7 @@ test('it supports loading showdown extensions', function(assert) {
   let component = this.subject({ extensions: 'demo excited' });
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set("markdown", "this is a showdown");
   });
 
@@ -171,7 +171,7 @@ test('it does not munge code fences', function(assert) {
   let component = this.subject();
   this.render();
 
-  Ember.run(function() {
+  run(function() {
     component.set("ghCodeBlocks", true);
     component.set("markdown", "```html\n<strong>hello</strong>\n<em>world</em>\n```");
   });