Merge pull request #65 from stefanpenner/smoke-test

adding smoke tests to catch initializer logic

.travis.yml

@@ -12,6 +12,9 @@ env:
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-1.10.0
+    - EMBER_TRY_SCENARIO=ember-1.11.3
+    - EMBER_TRY_SCENARIO=ember-1.12.0
 
 matrix:
   fast_finish: true

addon/computeds/ago.js

@@ -11,7 +11,7 @@ export default function computedAgo(date, maybeInputFormat) {
     let momentArgs = [get(this, date)];
 
     if (arguments.length > 1) {
-      let desc = isDescriptor(this[maybeInputFormat]);
+      let desc = isDescriptor.call(this, maybeInputFormat);
       let input = desc ? get(this, maybeInputFormat) : maybeInputFormat;
 
       if (desc && computed._dependentKeys.indexOf(maybeInputFormat) === -1) {

addon/computeds/duration.js

@@ -14,7 +14,7 @@ export default function computedDuration(val, maybeUnits) {
     momentArgs = [get(this, val)];
 
     if (numArgs > 1) {
-      desc = isDescriptor(this[maybeUnits]);
+      desc = isDescriptor.call(this, maybeUnits);
       input = desc ? get(this, maybeUnits) : maybeUnits;
 
       if (desc && computed._dependentKeys.indexOf(maybeUnits) === -1) {

addon/computeds/moment.js

@@ -16,8 +16,7 @@ export default function computedMoment(date, outputFormat, maybeInputFormat) {
     let momentArgs = [get(this, date)];
 
     let propertyValues = EnumerableUtils.map(args, (arg) => {
-      let desc = isDescriptor(this[arg]);
-
+      let desc = isDescriptor.call(this, arg);
       if (desc && result._dependentKeys.indexOf(arg) === -1) {
         result.property(arg);
       }

addon/helpers/ago.js

@@ -29,7 +29,7 @@ if (Ember.Helper) {
   });
 }
 else {
-  ago = Ember.HTMLBars.makeBoundHelper(buildHelper());
+  ago = buildHelper();
 }
 
 export default ago;

addon/helpers/duration.js

@@ -1,4 +1,3 @@
-import Ember from 'ember';
 import moment from 'moment';
 
 function durationHelper(params) {
@@ -11,4 +10,4 @@ function durationHelper(params) {
   return moment.duration.apply(this, params).humanize();
 }
 
-export default Ember.HTMLBars.makeBoundHelper(durationHelper);
+export default durationHelper;

addon/helpers/moment.js

@@ -1,4 +1,3 @@
-import Ember from 'ember';
 import moment from 'moment';
 
 function momentHelper(params) {
@@ -24,4 +23,4 @@ function momentHelper(params) {
   return moment.apply(this, args).format(output);
 }
 
-export default Ember.HTMLBars.makeBoundHelper(momentHelper);
+export default momentHelper;

addon/utils/is-descriptor.js

@@ -2,7 +2,14 @@ import Ember from 'ember';
 let { typeOf, Descriptor } = Ember;
 
 // credit: https://github.com/cibernox/ember-cpm/blob/master/addon/utils.js#L17-L20
-function isDescriptor(prop) {
+function isDescriptor(propertyName) {
+  const meta = Ember.meta(this);
+
+  if (meta && meta.descs && meta.descs[propertyName]) {
+    return true;
+  }
+
+  const prop = this[propertyName];
   return typeOf(prop) === 'object' && (prop.constructor === Descriptor || // Ember < 1.11
      prop.isDescriptor); // Ember >= 1.11.0
 }

addon/utils/make-bound-helper.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export default function(helper) {
+	if (Ember.Helper && Ember.Helper.detect(helper)) {
+		return helper;
+	}
+
+	return Ember.HTMLBars.makeBoundHelper(helper);
+}

app/helpers/ago.js

@@ -1 +1,4 @@
-export { default } from 'ember-moment/helpers/ago';
+import agoHelper from 'ember-moment/helpers/ago';
+import makeBoundHelper from 'ember-moment/utils/make-bound-helper';
+
+export default makeBoundHelper(agoHelper);

app/helpers/duration.js

@@ -1 +1,4 @@
-export { default } from 'ember-moment/helpers/duration';
+import durationHelper from 'ember-moment/helpers/duration';
+import makeBoundHelper from 'ember-moment/utils/make-bound-helper';
+
+export default makeBoundHelper(durationHelper);

app/helpers/moment.js

@@ -1 +1,4 @@
-export { default } from 'ember-moment/helpers/moment';
+import momentHelper from 'ember-moment/helpers/moment';
+import makeBoundHelper from 'ember-moment/utils/make-bound-helper';
+
+export default makeBoundHelper(momentHelper);

bower.json

@@ -1,16 +1,19 @@
 {
   "name": "ember-moment",
   "dependencies": {
-    "ember": "1.13.3",
+    "ember": "1.10.0",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
     "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "moment-timezone": "~0.2.5",
     "qunit": "~1.17.1"
+  },
+  "resolutions": {
+    "ember": "release"
   }
 }

config/ember-try.js

@@ -1,5 +1,25 @@
 module.exports = {
   scenarios: [
+    {
+      name: 'ember-1.10.0',
+      dependencies: {
+        'ember': '1.10.0',
+        'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2'
+      }
+    },
+		{
+      name: 'ember-1.11.3',
+      dependencies: {
+        'ember': '1.11.3',
+        'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2'
+      }
+    },
+		{
+      name: 'ember-1.12.0',
+      dependencies: {
+        'ember': '1.12.0'
+      }
+    },
     {
       name: 'default',
       dependencies: { }

tests/acceptance/smoke-test.js

@@ -0,0 +1,40 @@
+import Ember from 'ember';
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+
+let application;
+
+module('Acceptance: Smoke', {
+  beforeEach() {
+    application = startApp();
+  },
+  afterEach() {
+    if (application) {
+      Ember.run(application, 'destroy');
+    }
+  }
+});
+
+test('moment', (assert) => {
+  assert.expect(1);
+  visit('/smoke');
+  andThen(function() {
+    assert.equal(find('.moment-independence-day').text(), 'Jul 04, 1776');
+  });
+});
+
+test('ago', (assert) => {
+  assert.expect(1);
+  visit('/smoke');
+  andThen(function() {
+    assert.equal(find('.ago-now').text(), 'a few seconds ago');
+  });
+});
+
+test('duration', (assert) => {
+  assert.expect(1);
+  visit('/smoke');
+  andThen(function() {
+    assert.equal(find('.duration-seven-minutes').text(), '7 minutes');
+  });
+});

tests/dummy/app/controllers/smoke.js

@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  now: new Date(),
+  usIndependenceDay: new Date(1776, 6, 4, 12, 0, 0)
+});

tests/dummy/app/router.js

@@ -6,6 +6,8 @@ var Router = Ember.Router.extend({
 });
 
 Router.map(function() {
+   this.route('index', { path: '/' });
+   this.route('smoke', { path: '/smoke' });
 });
 
 export default Router;

tests/dummy/app/routes/smoke.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+import moment from 'moment';
+
+export default Ember.Route.extend({
+  setupController: function (controller, model) {
+    moment.locale('en');
+    return this._super(controller, model);
+  }
+});

tests/dummy/app/templates/smoke.hbs

@@ -0,0 +1,3 @@
+<div class="moment-independence-day">{{moment usIndependenceDay 'MMM DD, YYYY'}}</div>
+<div class="ago-now">{{ago now}}</div>
+<div class="duration-seven-minutes">{{duration 420000}}</div>