language stringclasses 1 value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2 classes |
|---|---|---|---|---|---|---|---|
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/initializer-test.js | @@ -1,350 +1,310 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy initializer', function() {
setupTestHooks(this);
it('initializer foo', function() {
- return generateAndDestroy(['initializer', 'foo'], {
- files: [
- {
- file:'app/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file:'tests/unit/initializers/foo-test.js',
- contains: "import FooInitializer from 'my-app/initializers/foo';"
- }
- ]
- });
+ var args = ['initializer', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.contain("import FooInitializer from 'my-app/initializers/foo';");
+ }));
});
it('initializer foo/bar', function() {
- return generateAndDestroy(['initializer', 'foo/bar'], {
- files: [
- {
- file:'app/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file:'tests/unit/initializers/foo/bar-test.js',
- contains: "import FooBarInitializer from 'my-app/initializers/foo/bar';"
- }
- ]
- });
+ var args = ['initializer', 'foo/bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('tests/unit/initializers/foo/bar-test.js'))
+ .to.contain("import FooBarInitializer from 'my-app/initializers/foo/bar';");
+ }));
});
it('in-addon initializer foo', function() {
- return generateAndDestroy(['initializer', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'addon/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/initializers/foo.js',
- contains: [
- "export { default, initialize } from 'my-addon/initializers/foo';"
- ]
- },
- {
- file: 'tests/unit/initializers/foo-test.js'
- }
- ]
- });
+ var args = ['initializer', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/initializers/foo.js'))
+ .to.contain("export { default, initialize } from 'my-addon/initializers/foo';");
+
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.exist;
+ }));
});
it('in-addon initializer foo/bar', function() {
- return generateAndDestroy(['initializer', 'foo/bar'], {
- target: 'addon',
- files: [
- {
- file: 'addon/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/initializers/foo/bar.js',
- contains: [
- "export { default, initialize } from 'my-addon/initializers/foo/bar';"
- ]
- },
- {
- file: 'tests/unit/initializers/foo/bar-test.js'
- }
- ]
- });
+ var args = ['initializer', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/initializers/foo/bar.js'))
+ .to.contain("export { default, initialize } from 'my-addon/initializers/foo/bar';");
+
+ expect(_file('tests/unit/initializers/foo/bar-test.js'))
+ .to.exist;
+ }));
});
it('dummy initializer foo', function() {
- return generateAndDestroy(['initializer', 'foo', '--dummy'], {
- target: 'addon',
- files: [
- {
- file: 'tests/dummy/app/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/initializers/foo.js',
- exists: false
- },
- {
- file: 'tests/unit/initializers/foo-test.js',
- exists: false
- }
- ]
- });
+ var args = ['initializer', 'foo', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/initializers/foo.js'))
+ .to.not.exist;
+
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.not.exist;
+ }));
});
it('dummy initializer foo/bar', function() {
- return generateAndDestroy(['initializer', 'foo/bar', '--dummy'], {
- target: 'addon',
- files: [
- {
- file: 'tests/dummy/app/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/initializers/foo/bar.js',
- exists: false
- },
- {
- file: 'tests/unit/initializers/foo/bar-test.js',
- exists: false
- }
- ]
- });
+ var args = ['initializer', 'foo/bar', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/initializers/foo/bar.js'))
+ .to.not.exist;
+
+ expect(_file('tests/unit/initializers/foo/bar-test.js'))
+ .to.not.exist;
+ }));
});
it('in-repo-addon initializer foo', function() {
- return generateAndDestroy(['initializer', 'foo', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'lib/my-addon/app/initializers/foo.js',
- contains: [
- "export { default, initialize } from 'my-addon/initializers/foo';"
- ]
- },
- {
- file: 'tests/unit/initializers/foo-test.js'
- }
- ]
- });
+ var args = ['initializer', 'foo', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('lib/my-addon/app/initializers/foo.js'))
+ .to.contain("export { default, initialize } from 'my-addon/initializers/foo';");
+
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.exist;
+ }));
});
it('in-repo-addon initializer foo/bar', function() {
- return generateAndDestroy(['initializer', 'foo/bar', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'lib/my-addon/app/initializers/foo/bar.js',
- contains: [
- "export { default, initialize } from 'my-addon/initializers/foo/bar';"
- ]
- },
- {
- file: 'tests/unit/initializers/foo/bar-test.js'
- }
- ]
- });
+ var args = ['initializer', 'foo/bar', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('lib/my-addon/app/initializers/foo/bar.js'))
+ .to.contain("export { default, initialize } from 'my-addon/initializers/foo/bar';");
+
+ expect(_file('tests/unit/initializers/foo/bar-test.js'))
+ .to.exist;
+ }));
});
/* Pod tests */
it('initializer foo --pod', function() {
- return generateAndDestroy(['initializer', 'foo', '--pod'], {
- files: [
- {
- file: 'app/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['initializer', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('initializer foo --pod podModulePrefix', function() {
- return generateAndDestroy(['initializer', 'foo', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/initializers/foo.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['initializer', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('initializer foo/bar --pod', function() {
- return generateAndDestroy(['initializer', 'foo/bar', '--pod'], {
- files: [
- {
- file: 'app/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['initializer', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('initializer foo/bar --pod podModulePrefix', function() {
- return generateAndDestroy(['initializer', 'foo/bar', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/initializers/foo/bar.js',
- contains: "export function initialize(/* application */) {\n" +
- " // application.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['initializer', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* application */) {\n" +
+ " // application.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('initializer-test foo', function() {
- return generateAndDestroy(['initializer-test', 'foo'], {
- files: [
- {
- file: 'tests/unit/initializers/foo-test.js',
- contains: [
- "import FooInitializer from 'my-app/initializers/foo';",
- "module('Unit | Initializer | foo'",
- "application = Ember.Application.create();",
- "FooInitializer.initialize(application);"
- ]
- }
- ]
- });
+ var args = ['initializer-test', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.contain("import FooInitializer from 'my-app/initializers/foo';")
+ .to.contain("module('Unit | Initializer | foo'")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("FooInitializer.initialize(application);");
+ }));
});
it('in-addon initializer-test foo', function() {
- return generateAndDestroy(['initializer-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/initializers/foo-test.js',
- contains: [
- "import FooInitializer from 'dummy/initializers/foo';",
- "module('Unit | Initializer | foo'",
- "application = Ember.Application.create();",
- "FooInitializer.initialize(application);"
- ]
- }
- ]
- });
+ var args = ['initializer-test', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.contain("import FooInitializer from 'dummy/initializers/foo';")
+ .to.contain("module('Unit | Initializer | foo'")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("FooInitializer.initialize(application);");
+ }));
});
it('initializer-test foo for mocha', function() {
- return generateAndDestroy(['initializer-test', 'foo'], {
- packages: [
- { name: 'ember-cli-qunit', delete: true },
- { name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/initializers/foo-test.js',
- contains: [
- "import FooInitializer from 'my-app/initializers/foo';",
- "describe('Unit | Initializer | foo', function() {",
- "application = Ember.Application.create();",
- "FooInitializer.initialize(application);"
- ]
- }
- ]
- });
+ var args = ['initializer-test', 'foo'];
+
+ return emberNew()
+ .then(() => modifyPackages([
+ {name: 'ember-cli-qunit', delete: true},
+ {name: 'ember-cli-mocha', dev: true}
+ ]))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/initializers/foo-test.js'))
+ .to.contain("import FooInitializer from 'my-app/initializers/foo';")
+ .to.contain("describe('Unit | Initializer | foo', function() {")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("FooInitializer.initialize(application);");
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/instance-initializer-addon-test.js | @@ -1,25 +1,23 @@
'use strict';
-var tmpenv = require('ember-cli-blueprint-test-helpers/lib/helpers/tmp-env');
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy instance-initializer-addon', function() {
- setupTestHooks(this, tmpenv);
+ setupTestHooks(this);
it('instance-initializer-addon foo', function() {
- // pass any additional command line options in the arguments array
- return generateAndDestroy(['instance-initializer-addon', 'foo'], {
- // define files to assert, and their contents
- target: 'addon',
- files: [
- {
- file: 'app/instance-initializers/foo.js',
- contains: "export { default, initialize } from 'my-addon/instance-initializers/foo';"
- }
- ]
- });
- });
+ var args = ['instance-initializer-addon', 'foo'];
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo';");
+ }));
+ });
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/instance-initializer-test.js | @@ -1,353 +1,311 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy instance-initializer', function() {
setupTestHooks(this);
it('instance-initializer foo', function() {
- return generateAndDestroy(['instance-initializer', 'foo'], {
- files: [
- {
- file:'app/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file:'tests/unit/instance-initializers/foo-test.js',
- contains: "import { initialize } from 'my-app/instance-initializers/foo';"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.contain("import { initialize } from 'my-app/instance-initializers/foo';");
+ }));
});
it('instance-initializer foo/bar', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar'], {
- files: [
- {
- file:'app/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file:'tests/unit/instance-initializers/foo/bar-test.js',
- contains: "import { initialize } from 'my-app/instance-initializers/foo/bar';"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('tests/unit/instance-initializers/foo/bar-test.js'))
+ .to.contain("import { initialize } from 'my-app/instance-initializers/foo/bar';");
+ }));
});
it('in-addon instance-initializer foo', function() {
- return generateAndDestroy(['instance-initializer', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'addon/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/instance-initializers/foo.js',
- contains: [
- "export { default, initialize } from 'my-addon/instance-initializers/foo';"
- ]
- },
- {
- file: 'tests/unit/instance-initializers/foo-test.js'
- }
- ]
- });
+ var args = ['instance-initializer', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo';");
+
+ expect(_file('tests/unit/instance-initializers/foo-test.js'));
+ }));
});
it('in-addon instance-initializer foo/bar', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar'], {
- target: 'addon',
- files: [
- {
- file: 'addon/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/instance-initializers/foo/bar.js',
- contains: [
- "export { default, initialize } from 'my-addon/instance-initializers/foo/bar';"
- ]
- },
- {
- file: 'tests/unit/instance-initializers/foo/bar-test.js'
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/instance-initializers/foo/bar.js'))
+ .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo/bar';");
+
+ expect(_file('tests/unit/instance-initializers/foo/bar-test.js'));
+ }));
});
it('dummy instance-initializer foo', function() {
- return generateAndDestroy(['instance-initializer', 'foo', '--dummy'], {
- target: 'addon',
- files: [
- {
- file: 'tests/dummy/app/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/instance-initializers/foo.js',
- exists: false
- },
- {
- file: 'tests/unit/instance-initializers/foo-test.js',
- exists: false
- }
- ]
- });
+ var args = ['instance-initializer', 'foo', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.not.exist;
+
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.not.exist;
+ }));
});
it('dummy instance-initializer foo/bar', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar', '--dummy'], {
- target: 'addon',
- files: [
- {
- file: 'tests/dummy/app/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'app/instance-initializers/foo/bar.js',
- exists: false
- },
- {
- file: 'tests/unit/instance-initializers/foo/bar-test.js',
- exists: false
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('app/instance-initializers/foo/bar.js'))
+ .to.not.exist;
+
+ expect(_file('tests/unit/instance-initializers/foo/bar-test.js'))
+ .to.not.exist;
+ }));
});
it('in-repo-addon instance-initializer foo', function() {
- return generateAndDestroy(['instance-initializer', 'foo', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'lib/my-addon/app/instance-initializers/foo.js',
- contains: [
- "export { default, initialize } from 'my-addon/instance-initializers/foo';"
- ]
- },
- {
- file: 'tests/unit/instance-initializers/foo-test.js'
- }
- ]
- });
+ var args = ['instance-initializer', 'foo', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('lib/my-addon/app/instance-initializers/foo.js'))
+ .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo';");
+
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.exist;
+ }));
});
it('in-repo-addon instance-initializer foo/bar', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- },
- {
- file: 'lib/my-addon/app/instance-initializers/foo/bar.js',
- contains: [
- "export { default, initialize } from 'my-addon/instance-initializers/foo/bar';"
- ]
- },
- {
- file: 'tests/unit/instance-initializers/foo/bar-test.js'
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+
+ expect(_file('lib/my-addon/app/instance-initializers/foo/bar.js'))
+ .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo/bar';");
+
+ expect(_file('tests/unit/instance-initializers/foo/bar-test.js'))
+ .to.exist;
+ }));
});
/* Pod tests */
it('instance-initializer foo --pod', function() {
- return generateAndDestroy(['instance-initializer', 'foo', '--pod'], {
- files: [
- {
- file: 'app/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('instance-initializer foo --pod podModulePrefix', function() {
- return generateAndDestroy(['instance-initializer', 'foo', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/instance-initializers/foo.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('instance-initializer foo/bar --pod', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar', '--pod'], {
- files: [
- {
- file: 'app/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('instance-initializer foo/bar --pod podModulePrefix', function() {
- return generateAndDestroy(['instance-initializer', 'foo/bar', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/instance-initializers/foo/bar.js',
- contains: "export function initialize(/* appInstance */) {\n" +
- " // appInstance.inject('route', 'foo', 'service:foo');\n" +
- "}\n" +
- "\n"+
- "export default {\n" +
- " name: 'foo/bar',\n" +
- " initialize\n" +
- "};"
- }
- ]
- });
+ var args = ['instance-initializer', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/instance-initializers/foo/bar.js'))
+ .to.contain("export function initialize(/* appInstance */) {\n" +
+ " // appInstance.inject('route', 'foo', 'service:foo');\n" +
+ "}\n" +
+ "\n" +
+ "export default {\n" +
+ " name: 'foo/bar',\n" +
+ " initialize\n" +
+ "};");
+ }));
});
it('instance-initializer-test foo', function() {
- return generateAndDestroy(['instance-initializer-test', 'foo'], {
- files: [
- {
- file: 'tests/unit/instance-initializers/foo-test.js',
- contains: [
- "import { initialize } from 'my-app/instance-initializers/foo';",
- "module('Unit | Instance Initializer | foo'",
- "application = Ember.Application.create();",
- "this.appInstance = this.application.buildInstance();",
- "initialize(this.appInstance);"
- ]
- }
- ]
- });
+ var args = ['instance-initializer-test', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.contain("import { initialize } from 'my-app/instance-initializers/foo';")
+ .to.contain("module('Unit | Instance Initializer | foo'")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("this.appInstance = this.application.buildInstance();")
+ .to.contain("initialize(this.appInstance);");
+ }));
});
it('in-addon instance-initializer-test foo', function() {
- return generateAndDestroy(['instance-initializer-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/instance-initializers/foo-test.js',
- contains: [
- "import { initialize } from 'dummy/instance-initializers/foo';",
- "module('Unit | Instance Initializer | foo'",
- "application = Ember.Application.create();",
- "this.appInstance = this.application.buildInstance();",
- "initialize(this.appInstance);"
- ]
- }
- ]
- });
+ var args = ['instance-initializer-test', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.contain("import { initialize } from 'dummy/instance-initializers/foo';")
+ .to.contain("module('Unit | Instance Initializer | foo'")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("this.appInstance = this.application.buildInstance();")
+ .to.contain("initialize(this.appInstance);");
+ }));
});
it('instance-initializer-test foo for mocha', function() {
- return generateAndDestroy(['instance-initializer-test', 'foo'], {
- packages: [
- { name: 'ember-cli-qunit', delete: true },
- { name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/instance-initializers/foo-test.js',
- contains: [
- "import { initialize } from 'my-app/instance-initializers/foo';",
- "describe('Unit | Instance Initializer | foo', function() {",
- "application = Ember.Application.create();",
- "appInstance = application.buildInstance();",
- "initialize(appInstance);"
- ]
- }
- ]
- });
+ var args = ['instance-initializer-test', 'foo'];
+
+ return emberNew()
+ .then(() => modifyPackages([
+ {name: 'ember-cli-qunit', delete: true},
+ {name: 'ember-cli-mocha', dev: true}
+ ]))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/instance-initializers/foo-test.js'))
+ .to.contain("import { initialize } from 'my-app/instance-initializers/foo';")
+ .to.contain("describe('Unit | Instance Initializer | foo', function() {")
+ .to.contain("application = Ember.Application.create();")
+ .to.contain("appInstance = application.buildInstance();")
+ .to.contain("initialize(appInstance);");
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/mixin-test.js | @@ -1,336 +1,248 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy mixin', function() {
setupTestHooks(this);
it('mixin foo', function() {
- return generateAndDestroy(['mixin', 'foo'], {
- files: [
- {
- file: 'app/mixins/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-app/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-app/mixins/foo';");
+ }));
});
it('mixin foo/bar', function() {
- return generateAndDestroy(['mixin', 'foo/bar'], {
- files: [
- {
- file: 'app/mixins/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar-test.js',
- contains: [
- "import FooBarMixin from 'my-app/mixins/foo/bar';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar-test.js'))
+ .to.contain("import FooBarMixin from 'my-app/mixins/foo/bar';");
+ }));
});
it('mixin foo/bar/baz', function() {
- return generateAndDestroy(['mixin', 'foo/bar/baz'], {
- files: [
- {
- file: 'tests/unit/mixins/foo/bar/baz-test.js',
- contains: [
- "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar/baz'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo/bar/baz-test.js'))
+ .to.contain("import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';");
+ }));
});
it('in-addon mixin foo', function() {
- return generateAndDestroy(['mixin', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'addon/mixins/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-addon/mixins/foo';"
- ]
- },
- {
- file: 'app/mixins/foo.js',
- exists: false
- }
- ]
- });
+ var args = ['mixin', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/mixins/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-addon/mixins/foo';");
+
+ expect(_file('app/mixins/foo.js'))
+ .to.not.exist;
+ }));
});
it('in-addon mixin foo/bar', function() {
- return generateAndDestroy(['mixin', 'foo/bar'], {
- target: 'addon',
- files: [
- {
- file: 'addon/mixins/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar-test.js',
- contains: [
- "import FooBarMixin from 'my-addon/mixins/foo/bar';"
- ]
- },
- {
- file: 'app/mixins/foo/bar.js',
- exists: false
- }
- ]
- });
+ var args = ['mixin', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/mixins/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar-test.js'))
+ .to.contain("import FooBarMixin from 'my-addon/mixins/foo/bar';");
+
+ expect(_file('app/mixins/foo/bar.js'))
+ .to.not.exist;
+ }));
});
it('in-addon mixin foo/bar/baz', function() {
- return generateAndDestroy(['mixin', 'foo/bar/baz'], {
- target: 'addon',
- files: [
- {
- file: 'addon/mixins/foo/bar/baz.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar/baz-test.js',
- contains: [
- "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
- ]
- },
- {
- file: 'app/mixins/foo/bar/baz.js',
- exists: false
- }
- ]
- });
- })
+ var args = ['mixin', 'foo/bar/baz'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/mixins/foo/bar/baz.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar/baz-test.js'))
+ .to.contain("import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';");
+
+ expect(_file('app/mixins/foo/bar/baz.js'))
+ .to.not.exist;
+ }));
+ });
it('in-repo-addon mixin foo', function() {
- return generateAndDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/mixins/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-addon/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/mixins/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-addon/mixins/foo';");
+ }));
});
it('in-repo-addon mixin foo/bar', function() {
- return generateAndDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/mixins/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar-test.js',
- contains: [
- "import FooBarMixin from 'my-addon/mixins/foo/bar';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/mixins/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar-test.js'))
+ .to.contain("import FooBarMixin from 'my-addon/mixins/foo/bar';");
+ }));
});
it('in-repo-addon mixin foo/bar/baz', function() {
- return generateAndDestroy(['mixin', 'foo/bar/baz', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'tests/unit/mixins/foo/bar/baz-test.js',
- contains: [
- "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar/baz', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo/bar/baz-test.js'))
+ .to.contain("import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';");
+ }));
});
/* Pod tests */
it('mixin foo --pod', function() {
- return generateAndDestroy(['mixin', 'foo', '--pod'], {
- files: [
- {
- file: 'app/mixins/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-app/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-app/mixins/foo';");
+ }));
});
it('mixin foo --pod podModulePrefix', function() {
- return generateAndDestroy(['mixin', 'foo', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/mixins/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-app/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-app/mixins/foo';");
+ }));
});
it('mixin foo/bar --pod', function() {
- return generateAndDestroy(['mixin', 'foo/bar', '--pod'], {
- files: [
- {
- file: 'app/mixins/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar-test.js',
- contains: [
- "import FooBarMixin from 'my-app/mixins/foo/bar';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar-test.js'))
+ .to.contain("import FooBarMixin from 'my-app/mixins/foo/bar';");
+ }));
});
it('mixin foo/bar --pod podModulePrefix', function() {
- return generateAndDestroy(['mixin', 'foo/bar', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/mixins/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Mixin.create({\n});'
- ]
- },
- {
- file: 'tests/unit/mixins/foo/bar-test.js',
- contains: [
- "import FooBarMixin from 'my-app/mixins/foo/bar';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/mixins/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Mixin.create({\n});');
+
+ expect(_file('tests/unit/mixins/foo/bar-test.js'))
+ .to.contain("import FooBarMixin from 'my-app/mixins/foo/bar';");
+ }));
});
it('mixin foo/bar/baz --pod', function() {
- return generateAndDestroy(['mixin', 'foo/bar/baz', '--pod'], {
- files: [
- {
- file: 'tests/unit/mixins/foo/bar/baz-test.js',
- contains: [
- "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
- ]
- }
- ]
- });
+ var args = ['mixin', 'foo/bar/baz', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo/bar/baz-test.js'))
+ .to.contain("import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';");
+ }));
});
it('mixin-test foo', function() {
- return generateAndDestroy(['mixin-test', 'foo'], {
- files: [
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-app/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin-test', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-app/mixins/foo';");
+ }));
});
it('in-addon mixin-test foo', function() {
- return generateAndDestroy(['mixin-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import FooMixin from 'my-addon/mixins/foo';"
- ]
- }
- ]
- });
+ var args = ['mixin-test', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import FooMixin from 'my-addon/mixins/foo';");
+ }));
});
it('mixin-test foo for mocha', function() {
- return generateAndDestroy(['mixin-test', 'foo'], {
- packages: [
- { name: 'ember-cli-qunit', delete: true },
- { name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/mixins/foo-test.js',
- contains: [
- "import { describe, it } from 'mocha';",
- "import FooMixin from 'my-app/mixins/foo';",
- "describe('Unit | Mixin | foo', function() {"
- ]
- }
- ]
- });
+ var args = ['mixin-test', 'foo'];
+
+ return emberNew()
+ .then(() => modifyPackages([
+ {name: 'ember-cli-qunit', delete: true},
+ {name: 'ember-cli-mocha', dev: true}
+ ]))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/mixins/foo-test.js'))
+ .to.contain("import { describe, it } from 'mocha';")
+ .to.contain("import FooMixin from 'my-app/mixins/foo';")
+ .to.contain("describe('Unit | Mixin | foo', function() {");
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/route-addon-test.js | @@ -1,30 +1,25 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy route-addon', function() {
setupTestHooks(this);
it('route-addon foo', function() {
- return generateAndDestroy(['route-addon', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'app/routes/foo.js',
- contains: [
- "export { default } from 'my-addon/routes/foo';"
- ]
- },
- {
- file: 'app/templates/foo.js',
- contains: [
- "export { default } from 'my-addon/templates/foo';"
- ]
- },
- ]
- });
- });
+ var args = ['route-addon', 'foo'];
+ return emberNew({ target: 'addon' }).then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/routes/foo.js'))
+ .to.contain("export { default } from 'my-addon/routes/foo';");
+
+ expect(_file('app/templates/foo.js'))
+ .to.contain("export { default } from 'my-addon/templates/foo';");
+ }));
+ });
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/route-test.js | @@ -4,671 +4,424 @@ var fs = require('fs-extra');
var path = require('path');
var RSVP = require('rsvp');
var remove = RSVP.denodeify(fs.remove);
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var initProject = require('ember-cli-blueprint-test-helpers/lib/helpers/project-init');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
-var destroy = BlueprintHelpers.destroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerate = blueprintHelpers.emberGenerate;
+var emberDestroy = blueprintHelpers.emberDestroy;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
+var file = chai.file;
describe('Acceptance: ember generate and destroy route', function() {
setupTestHooks(this);
it('route foo', function() {
- var files = [
- {
- file: 'app/router.js',
- contains: 'this.route(\'foo\')'
- },
- {
- file: 'app/routes/foo.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/templates/foo.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/routes/foo.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('app/templates/foo.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+
+ expect(file('app/router.js'))
+ .to.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'foo\')'));
});
it('route foo with --skip-router', function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: 'this.route(\'foo\')'
- },
- {
- file: 'app/routes/foo.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/templates/foo.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--skip-router'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--skip-router'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/routes/foo.js')).to.exist;
+ expect(_file('app/templates/foo.hbs')).to.exist;
+ expect(_file('tests/unit/routes/foo-test.js')).to.exist;
+ expect(file('app/router.js')).to.not.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('app/router.js')).to.not.contain('this.route(\'foo\')'));
});
it('route foo with --path', function() {
- var files = [
- {
- file: 'app/router.js',
- contains: [
- 'this.route(\'foo\', {',
- 'path: \':foo_id/show\'',
- '});'
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--path=:foo_id/show'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--path=:foo_id/show'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/routes/foo.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('app/templates/foo.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+
+ expect(file('app/router.js'))
+ .to.contain('this.route(\'foo\', {')
+ .to.contain('path: \':foo_id/show\'')
+ .to.contain('});');
+ }))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'foo\'')
+ .to.not.contain('path: \':foo_id/show\''));
});
it('route index', function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('index');"
- }
- ];
-
- return generateAndDestroy(['route', 'index'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'index'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/routes/index.js')).to.exist;
+ expect(_file('app/templates/index.hbs')).to.exist;
+ expect(_file('tests/unit/routes/index-test.js')).to.exist;
+ expect(file('app/router.js')).to.not.contain('this.route(\'index\')');
+ }))
+ .then(() => expect(file('app/router.js')).to.not.contain('this.route(\'index\')'));
});
it('route application', function() {
- return generateAndDestroy(['route', 'foo'], {
- afterGenerate: function(){
- return remove(path.join('app', 'templates', 'application.hbs'))
- .then(function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('application');"
- }
- ];
-
- return generateAndDestroy(['route', 'application'], {
- skipInit: true,
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
- });
- }
- });
+ var args = ['route', 'application'];
+
+ return emberNew()
+ .then(() => remove(path.resolve('app/templates/application.hbs')))
+ .then(() => emberGenerate(args))
+ .then(() => expect(file('app/router.js')).to.not.contain('this.route(\'application\')'));
});
it('route basic isn\'t added to router', function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('basic');"
- },
- {
- file: 'app/routes/basic.js'
- }
- ];
-
- return generateAndDestroy(['route', 'basic'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'basic'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/routes/basic.js')).to.exist;
+ expect(file('app/router.js')).to.not.contain('this.route(\'basic\')');
+ }))
+ .then(() => expect(file('app/router.js')).to.not.contain('this.route(\'basic\')'));
});
it('in-addon route foo', function() {
- var files = [
- {
- file: 'addon/routes/foo.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/routes/foo.js',
- contains: [
- "export { default } from 'my-addon/routes/foo';"
- ]
- },
- {
- file: 'addon/templates/foo.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'app/templates/foo.js',
- contains: "export { default } from 'my-addon/templates/foo';"
- },
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- },
- {
- file: 'tests/dummy/app/router.js',
- doesNotContain: "this.route('foo');"
- }
- ];
-
- return generateAndDestroy(['route', 'foo'], {
- target: 'addon',
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.pop();
- },
- files: files,
- });
+ var args = ['route', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('addon/routes/foo.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('addon/templates/foo.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('app/routes/foo.js'))
+ .to.contain('export { default } from \'my-addon/routes/foo\';');
+
+ expect(_file('app/templates/foo.js'))
+ .to.contain('export { default } from \'my-addon/templates/foo\';');
+
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+
+ expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'foo\')'));
});
it('in-addon route foo/bar', function() {
- var files = [
- {
- file: 'addon/routes/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/routes/foo/bar.js',
- contains: "export { default } from 'my-addon/routes/foo/bar';"
- },
- {
- file: 'app/templates/foo/bar.js',
- contains: "export { default } from 'my-addon/templates/foo/bar';"
- },
- {
- file: 'tests/unit/routes/foo/bar-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo/bar'"
- ]
- },
- {
- file: 'tests/dummy/app/router.js',
- doesNotContain: "this.route('bar');"
- }
- ];
-
- return generateAndDestroy(['route', 'foo/bar'], {
- target: 'addon',
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.pop();
- },
- files: files,
- });
+ var args = ['route', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('addon/routes/foo/bar.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('addon/templates/foo/bar.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('app/routes/foo/bar.js'))
+ .to.contain('export { default } from \'my-addon/routes/foo/bar\';');
+
+ expect(_file('app/templates/foo/bar.js'))
+ .to.contain('export { default } from \'my-addon/templates/foo/bar\';');
+
+ expect(_file('tests/unit/routes/foo/bar-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo/bar\'');
+
+ expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'bar\')');
+ }))
+ .then(() => expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'bar\')'));
});
it('dummy route foo', function() {
- var files = [
- {
- file: 'tests/dummy/app/router.js',
- contains: "this.route('foo');"
- },
- {
- file: 'tests/dummy/app/routes/foo.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/routes/foo.js',
- exists: false
- },
- {
- file: 'tests/dummy/app/templates/foo.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'app/templates/foo.js',
- exists: false
- },
- {
- file: 'tests/unit/routes/foo-test.js',
- exists: false
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--dummy'], {
- target: 'addon',
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('tests/dummy/app/routes/foo.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('tests/dummy/app/templates/foo.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('app/routes/foo.js')).to.not.exist;
+ expect(_file('app/templates/foo.hbs')).to.not.exist;
+ expect(_file('tests/unit/routes/foo-test.js')).to.not.exist;
+
+ expect(file('tests/dummy/app/router.js'))
+ .to.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'foo\')'));
});
it('dummy route foo/bar', function() {
- var files = [
- {
- file: 'tests/dummy/app/router.js',
- contains: [
- "this.route('foo', function() {",
- "this.route('bar');",
- ]
- },
- {
- file: 'tests/dummy/app/routes/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/routes/foo/bar.js',
- exists: false
- },
- {
- file: 'tests/dummy/app/templates/foo/bar.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'tests/unit/routes/foo/bar-test.js',
- exists: false
- }
- ];
-
- return generateAndDestroy(['route', 'foo/bar', '--dummy'], {
- target: 'addon',
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo/bar', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('tests/dummy/app/routes/foo/bar.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('tests/dummy/app/templates/foo/bar.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('app/routes/foo/bar.js')).to.not.exist;
+ expect(_file('app/templates/foo/bar.hbs')).to.not.exist;
+ expect(_file('tests/unit/routes/foo/bar-test.js')).to.not.exist;
+
+ expect(file('tests/dummy/app/router.js'))
+ .to.contain('this.route(\'foo\', function() {')
+ .to.contain('this.route(\'bar\')');
+ }))
+ .then(() => expect(file('tests/dummy/app/router.js'))
+ .to.not.contain('this.route(\'bar\')'));
});
it('in-repo-addon route foo', function() {
- return generateAndDestroy(['route', 'foo', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/routes/foo.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'lib/my-addon/app/routes/foo.js',
- contains: "export { default } from 'my-addon/routes/foo';"
- },
- {
- file: 'lib/my-addon/addon/templates/foo.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'lib/my-addon/app/templates/foo.js',
- contains: "export { default } from 'my-addon/templates/foo';"
- },
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ]
- });
+ var args = ['route', 'foo', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('lib/my-addon/addon/routes/foo.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('lib/my-addon/addon/templates/foo.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('lib/my-addon/app/routes/foo.js'))
+ .to.contain('export { default } from \'my-addon/routes/foo\';');
+
+ expect(_file('lib/my-addon/app/templates/foo.js'))
+ .to.contain('export { default } from \'my-addon/templates/foo\';');
+
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+ }));
});
it('in-repo-addon route foo/bar', function() {
- return generateAndDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- {
- file: 'lib/my-addon/addon/routes/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'lib/my-addon/app/routes/foo/bar.js',
- contains: "export { default } from 'my-addon/routes/foo/bar';"
- },
- {
- file: 'lib/my-addon/addon/templates/foo/bar.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'lib/my-addon/app/templates/foo/bar.js',
- contains: "export { default } from 'my-addon/templates/foo/bar';"
- },
- {
- file: 'tests/unit/routes/foo/bar-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo/bar'"
- ]
- }
- ]
- });
- });
+ var args = ['route', 'foo/bar', '--in-repo-addon=my-addon'];
-/**
-* Pod tests
-*
-*/
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('lib/my-addon/addon/routes/foo/bar.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
- it('in-addon route foo --pod', function() {
- return generateAndDestroy(['route', 'foo', '--pod'], {
- target: 'addon',
- files: [
- {
- file: 'addon/foo/route.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'addon/foo/template.hbs',
- contains: "{{outlet}}"
- },
- {
- file: 'app/foo/route.js',
- contains: [
- "export { default } from 'my-addon/foo/route';"
- ]
- },
- {
- file: 'app/foo/template.js',
- contains: [
- "export { default } from 'my-addon/foo/template';"
- ]
- },
- {
- file: 'tests/unit/foo/route-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ]
- });
- });
+ expect(_file('lib/my-addon/addon/templates/foo/bar.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('lib/my-addon/app/routes/foo/bar.js'))
+ .to.contain('export { default } from \'my-addon/routes/foo/bar\';');
+ expect(_file('lib/my-addon/app/templates/foo/bar.js'))
+ .to.contain('export { default } from \'my-addon/templates/foo/bar\';');
+
+ expect(_file('tests/unit/routes/foo/bar-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo/bar\'');
+ }));
+ });
it('route foo --pod', function() {
- var files = [
- {
- file: 'app/router.js',
- contains: 'this.route(\'foo\')'
- },
- {
- file: 'app/foo/route.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/foo/template.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'tests/unit/foo/route-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--pod'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/foo/route.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('app/foo/template.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('tests/unit/foo/route-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+
+ expect(file('app/router.js'))
+ .to.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'foo\')'));
});
it('route foo --pod with --path', function() {
- var files = [
- {
- file: 'app/router.js',
- contains: [
- 'this.route(\'foo\', {',
- 'path: \':foo_id/show\'',
- '});'
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--pod', '--path=:foo_id/show'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--pod', '--path=:foo_id/show'];
+
+ return emberNew()
+ .then(() => emberGenerate(args))
+ .then(() => expect(file('app/router.js'))
+ .to.contain('this.route(\'foo\', {')
+ .to.contain('path: \':foo_id/show\'')
+ .to.contain('});'))
+
+ .then(() => emberDestroy(args))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'foo\', {')
+ .to.not.contain('path: \':foo_id/show\''));
});
-
it('route foo --pod podModulePrefix', function() {
- var files = [
- {
- file: 'app/router.js',
- contains: 'this.route(\'foo\')'
- },
- {
- file: 'app/pods/foo/route.js',
- contains: [
- "import Ember from 'ember';",
- "export default Ember.Route.extend({\n});"
- ]
- },
- {
- file: 'app/pods/foo/template.hbs',
- contains: '{{outlet}}'
- },
- {
- file: 'tests/unit/pods/foo/route-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ];
-
- return generateAndDestroy(['route', 'foo', '--pod'], {
- podModulePrefix: true,
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/pods/foo/route.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('app/pods/foo/template.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('tests/unit/pods/foo/route-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+
+ expect(file('app/router.js'))
+ .to.contain('this.route(\'foo\')');
+ }))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'foo\')'));
});
it('route index --pod', function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('index');"
- }
- ];
-
- return generateAndDestroy(['route', 'index', '--pod'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'index', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerate(args))
+ .then(() => expect(file('app/router.js'))
+ .to.not.contain('this.route(\'index\')'));
});
it('route application --pod', function() {
- return generateAndDestroy(['route', 'foo'], {
- afterGenerate: function(){
- return remove(path.join('app', 'templates', 'application.hbs'))
- .then(function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('application');"
- }
- ];
-
- return generateAndDestroy(['route', 'application', '--pod'], {
- skipInit: true,
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
- });
- }
- });
+ var args = ['route', 'application', '--pod'];
+
+ return emberNew()
+ .then(() => remove(path.resolve('app/templates/application.hbs')))
+ .then(() => emberGenerate(args))
+ .then(() => expect(file('app/application/route.js')).to.exist)
+ .then(() => expect(file('app/application/template.hbs')).to.exist)
+ .then(() => expect(file('app/router.js')).to.not.contain('this.route(\'application\')'));
});
it('route basic --pod isn\'t added to router', function() {
- var files = [
- {
- file: 'app/router.js',
- doesNotContain: "this.route('basic');"
- },
- {
- file: 'app/basic/route.js'
- }
- ];
-
- return generateAndDestroy(['route', 'basic', '--pod'], {
- afterDestroy: function() {
- // remove `app/router.js` to work around https://github.com/ember-cli/ember-cli-blueprint-test-helpers/issues/38
- files.shift();
- },
- files: files,
- });
+ var args = ['route', 'basic', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('app/basic/route.js')).to.exist;
+ expect(file('app/router.js'))
+ .to.not.contain('this.route(\'index\')');
+ }));
});
- it('route-test foo', function() {
- return generateAndDestroy(['route-test', 'foo'], {
- files: [
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- }
- ]
- });
- });
+ it('in-addon route foo --pod', function() {
+ var args = ['route', 'foo', '--pod'];
- it('in-addon route-test foo', function() {
- return generateAndDestroy(['route-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- },
- {
- file: 'app/route-test/foo.js',
- exists: false
- }
- ]
- });
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('addon/foo/route.js'))
+ .to.contain('import Ember from \'ember\';')
+ .to.contain('export default Ember.Route.extend({\n});');
+
+ expect(_file('addon/foo/template.hbs'))
+ .to.contain('{{outlet}}');
+
+ expect(_file('app/foo/route.js'))
+ .to.contain('export { default } from \'my-addon/foo/route\';');
+
+ expect(_file('app/foo/template.js'))
+ .to.contain('export { default } from \'my-addon/foo/template\';');
+
+ expect(_file('tests/unit/foo/route-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+ }));
});
+ it('route-test foo', function() {
+ var args = ['route-test', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+ }));
+ });
- it('dummy route-test foo', function() {
- return generateAndDestroy(['route-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('route:foo'"
- ]
- },
- {
- file: 'app/route-test/foo.js',
- exists: false
- }
- ]
- });
+ it('in-addon route-test foo', function() {
+ var args = ['route-test', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { moduleFor, test } from \'ember-qunit\';')
+ .to.contain('moduleFor(\'route:foo\'');
+ }));
});
it('route-test foo for mocha', function() {
- return generateAndDestroy(['route-test', 'foo'], {
- packages: [
+ var args = ['route-test', 'foo'];
+
+ return emberNew()
+ .then(() => modifyPackages([
{ name: 'ember-cli-qunit', delete: true },
{ name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/routes/foo-test.js',
- contains: [
- "import { describeModule, it } from 'ember-mocha';",
- "describeModule('route:foo', 'Unit | Route | foo'"
- ]
- }
- ]
- });
+ ]))
+
+ .then(() => emberGenerateDestroy(args, (_file) => {
+ expect(_file('tests/unit/routes/foo-test.js'))
+ .to.contain('import { describeModule, it } from \'ember-mocha\';')
+ .to.contain('describeModule(\'route:foo\', \'Unit | Route | foo\'');
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/service-test.js | @@ -1,247 +1,182 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy service', function() {
setupTestHooks(this);
it('service foo', function() {
- return generateAndDestroy(['service', 'foo'], {
- files: [
- {
- file: 'app/services/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/services/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/services/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/services/foo-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+ }));
});
it('service foo/bar', function() {
- return generateAndDestroy(['service', 'foo/bar'], {
- files: [
- {
- file: 'app/services/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/services/foo/bar-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo/bar'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo/bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/services/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/services/foo/bar-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo/bar'");
+ }));
});
it('in-addon service foo', function() {
- return generateAndDestroy(['service', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'addon/services/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'app/services/foo.js',
- contains: [
- "export { default } from 'my-addon/services/foo';"
- ]
- },
- {
- file: 'tests/unit/services/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/services/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('app/services/foo.js'))
+ .to.contain("export { default } from 'my-addon/services/foo';");
+
+ expect(_file('tests/unit/services/foo-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+ }));
});
it('in-addon service foo/bar', function() {
- return generateAndDestroy(['service', 'foo/bar'], {
- target: 'addon',
- files: [
- {
- file: 'addon/services/foo/bar.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'app/services/foo/bar.js',
- contains: [
- "export { default } from 'my-addon/services/foo/bar';"
- ]
- },
- {
- file: 'tests/unit/services/foo/bar-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo/bar'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/services/foo/bar.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('app/services/foo/bar.js'))
+ .to.contain("export { default } from 'my-addon/services/foo/bar';");
+
+ expect(_file('tests/unit/services/foo/bar-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo/bar'");
+ }));
});
-/**
-* Pod tests
-*
-*/
it('service foo --pod', function() {
- return generateAndDestroy(['service', 'foo', '--pod'], {
- files: [
- {
- file: 'app/foo/service.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/foo/service-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/foo/service.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/foo/service-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+ }));
});
it('service foo/bar --pod', function() {
- return generateAndDestroy(['service', 'foo/bar', '--pod'], {
- files: [
- {
- file: 'app/foo/bar/service.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/foo/bar/service-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo/bar'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/foo/bar/service.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/foo/bar/service-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo/bar'");
+ }));
});
it('service foo --pod podModulePrefix', function() {
- return generateAndDestroy(['service', 'foo', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/pods/foo/service.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/pods/foo/service-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/pods/foo/service.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/pods/foo/service-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+ }));
});
it('service foo/bar --pod podModulePrefix', function() {
- return generateAndDestroy(['service', 'foo/bar', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/pods/foo/bar/service.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Service.extend({\n});'
- ]
- },
- {
- file: 'tests/unit/pods/foo/bar/service-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo/bar'"
- ]
- }
- ]
- });
+ var args = ['service', 'foo/bar', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/pods/foo/bar/service.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Service.extend({\n});');
+
+ expect(_file('tests/unit/pods/foo/bar/service-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo/bar'");
+ }));
});
it('service-test foo', function() {
- return generateAndDestroy(['service-test', 'foo'], {
- files: [
- {
- file: 'tests/unit/services/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- }
- ]
- });
+ var args = ['service-test', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/services/foo-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+ }));
});
it('in-addon service-test foo', function() {
- return generateAndDestroy(['service-test', 'foo'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/services/foo-test.js',
- contains: [
- "import { moduleFor, test } from 'ember-qunit';",
- "moduleFor('service:foo'"
- ]
- },
- {
- file: 'app/service-test/foo.js',
- exists: false
- }
- ]
- });
+ var args = ['service-test', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/services/foo-test.js'))
+ .to.contain("import { moduleFor, test } from 'ember-qunit';")
+ .to.contain("moduleFor('service:foo'");
+
+ expect(_file('app/service-test/foo.js'))
+ .to.not.exist;
+ }));
});
it('service-test foo for mocha', function() {
- return generateAndDestroy(['service-test', 'foo'], {
- packages: [
- { name: 'ember-cli-qunit', delete: true },
- { name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/services/foo-test.js',
- contains: [
- "import { describeModule, it } from 'ember-mocha';",
- "describeModule('service:foo', 'Unit | Service | foo'"
- ]
- }
- ]
- });
+ var args = ['service-test', 'foo'];
+
+ return emberNew()
+ .then(() => modifyPackages([
+ {name: 'ember-cli-qunit', delete: true},
+ {name: 'ember-cli-mocha', dev: true}
+ ]))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/services/foo-test.js'))
+ .to.contain("import { describeModule, it } from 'ember-mocha';")
+ .to.contain("describeModule('service:foo', 'Unit | Service | foo'");
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/template-test.js | @@ -1,118 +1,137 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy template', function() {
setupTestHooks(this);
it('template foo', function() {
- return generateAndDestroy(['template', 'foo'], {
- files: [
- { file: 'app/templates/foo.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/templates/foo.hbs')).to.equal('');
+ }));
});
it('template foo/bar', function() {
- return generateAndDestroy(['template', 'foo/bar'], {
- files: [
- { file: 'app/templates/foo/bar.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/templates/foo/bar.hbs')).to.equal('');
+ }));
});
it('template foo --pod', function() {
- return generateAndDestroy(['template', 'foo'], {
- usePods: true,
- files: [
- { file: 'app/foo/template.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo'];
+
+ return emberNew()
+ .then(() => setupPodConfig({
+ usePods: true
+ }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/foo/template.hbs')).to.equal('');
+ }));
});
it('template foo/bar --pod', function() {
- return generateAndDestroy(['template', 'foo/bar'], {
- usePods: true,
- files: [
- { file: 'app/foo/bar/template.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar'];
+
+ return emberNew()
+ .then(() => setupPodConfig({
+ usePods: true
+ }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/foo/bar/template.hbs')).to.equal('');
+ }));
});
it('template foo --pod podModulePrefix', function() {
- return generateAndDestroy(['template', 'foo'], {
- usePods: true,
- podModulePrefix: true,
- files: [
- { file: 'app/pods/foo/template.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo'];
+
+ return emberNew()
+ .then(() => setupPodConfig({
+ usePods: true,
+ podModulePrefix: true
+ }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/pods/foo/template.hbs')).to.equal('');
+ }));
});
it('template foo/bar --pod podModulePrefix', function() {
- return generateAndDestroy(['template', 'foo/bar'], {
- usePods: true,
- podModulePrefix: true,
- files: [
- { file: 'app/pods/foo/bar/template.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar'];
+
+ return emberNew()
+ .then(() => setupPodConfig({
+ usePods: true,
+ podModulePrefix: true
+ }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/pods/foo/bar/template.hbs')).to.equal('');
+ }));
});
it('in-addon template foo', function() {
- return generateAndDestroy(['template', 'foo'], {
- target: 'addon',
- files: [
- { file: 'addon/templates/foo.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/templates/foo.hbs')).to.equal('');
+ }));
});
it('in-addon template foo/bar', function() {
- return generateAndDestroy(['template', 'foo/bar'], {
- target: 'addon',
- files: [
- { file: 'addon/templates/foo/bar.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/templates/foo/bar.hbs')).to.equal('');
+ }));
});
it('dummy template foo', function() {
- return generateAndDestroy(['template', 'foo', '--dummy'], {
- target: 'addon',
- files: [
- { file: 'tests/dummy/app/templates/foo.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('');
+ }));
});
it('dummy template foo/bar', function() {
- return generateAndDestroy(['template', 'foo/bar', '--dummy'], {
- target: 'addon',
- files: [
- { file: 'tests/dummy/app/templates/foo/bar.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar', '--dummy'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal('');
+ }));
});
it('in-repo-addon template foo', function() {
- return generateAndDestroy(['template', 'foo', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- { file: 'lib/my-addon/addon/templates/foo.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('');
+ }));
});
it('in-repo-addon template foo/bar', function() {
- return generateAndDestroy(['template', 'foo/bar', '--in-repo-addon=my-addon'], {
- target: 'inRepoAddon',
- files: [
- { file: 'lib/my-addon/addon/templates/foo/bar.hbs', isEmpty: true }
- ]
- });
+ var args = ['template', 'foo/bar', '--in-repo-addon=my-addon'];
+
+ return emberNew({ target: 'in-repo-addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal('');
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/test-helper-test.js | @@ -1,23 +1,24 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy test-helper', function() {
setupTestHooks(this);
it('test-helper foo', function() {
- return generateAndDestroy(['test-helper', 'foo'], {
- files: [
- {
- file: 'tests/helpers/foo.js',
- contains: [
- "import Ember from 'ember';",
- 'export default Ember.Test.registerAsyncHelper(\'foo\', function(app) {\n\n}'
- ]
- }
- ]
- });
+ var args = ['test-helper', 'foo'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/helpers/foo.js'))
+ .to.contain("import Ember from 'ember';")
+ .to.contain('export default Ember.Test.registerAsyncHelper(\'foo\', function(app) {\n\n}');
+ }));
});
}); | true |
Other | emberjs | ember.js | b273c005ce2a6550bc74f7adadc0ee171fc2e4a2.json | tests/blueprints: Use new testing API | node-tests/blueprints/util-test.js | @@ -1,207 +1,163 @@
'use strict';
-var setupTestHooks = require('ember-cli-blueprint-test-helpers/lib/helpers/setup');
-var BlueprintHelpers = require('ember-cli-blueprint-test-helpers/lib/helpers/blueprint-helper');
-var generateAndDestroy = BlueprintHelpers.generateAndDestroy;
+var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks = blueprintHelpers.setupTestHooks;
+var emberNew = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var modifyPackages = blueprintHelpers.modifyPackages;
+var setupPodConfig = blueprintHelpers.setupPodConfig;
+
+var chai = require('ember-cli-blueprint-test-helpers/chai');
+var expect = chai.expect;
describe('Acceptance: ember generate and destroy util', function() {
setupTestHooks(this);
it('util foo-bar', function() {
- return generateAndDestroy(['util', 'foo-bar'], {
- files: [
- {
- file: 'app/utils/foo-bar.js',
- contains: 'export default function fooBar() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'my-app/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo-bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/utils/foo-bar.js'))
+ .to.contain('export default function fooBar() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'my-app/utils/foo-bar';");
+ }));
});
it('util foo-bar/baz', function() {
- return generateAndDestroy(['util', 'foo/bar-baz'], {
- files: [
- {
- file: 'app/utils/foo/bar-baz.js',
- contains: 'export default function fooBarBaz() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'tests/unit/utils/foo/bar-baz-test.js',
- contains: [
- "import fooBarBaz from 'my-app/utils/foo/bar-baz';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo/bar-baz'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/utils/foo/bar-baz.js'))
+ .to.contain('export default function fooBarBaz() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('tests/unit/utils/foo/bar-baz-test.js'))
+ .to.contain("import fooBarBaz from 'my-app/utils/foo/bar-baz';");
+ }));
});
it('in-addon util foo-bar', function() {
- return generateAndDestroy(['util', 'foo-bar'], {
- target: 'addon',
- files: [
- {
- file: 'addon/utils/foo-bar.js',
- contains: 'export default function fooBar() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'app/utils/foo-bar.js',
- contains: [
- "export { default } from 'my-addon/utils/foo-bar';"
- ]
- },
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'dummy/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo-bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/utils/foo-bar.js'))
+ .to.contain('export default function fooBar() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('app/utils/foo-bar.js'))
+ .to.contain("export { default } from 'my-addon/utils/foo-bar';");
+
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'dummy/utils/foo-bar';");
+ }));
});
it('in-addon util foo-bar/baz', function() {
- return generateAndDestroy(['util', 'foo/bar-baz'], {
- target: 'addon',
- files: [
- {
- file: 'addon/utils/foo/bar-baz.js',
- contains: 'export default function fooBarBaz() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'app/utils/foo/bar-baz.js',
- contains: [
- "export { default } from 'my-addon/utils/foo/bar-baz';"
- ]
- },
- {
- file: 'tests/unit/utils/foo/bar-baz-test.js',
- contains: [
- "import fooBarBaz from 'dummy/utils/foo/bar-baz';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo/bar-baz'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('addon/utils/foo/bar-baz.js'))
+ .to.contain('export default function fooBarBaz() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('app/utils/foo/bar-baz.js'))
+ .to.contain("export { default } from 'my-addon/utils/foo/bar-baz';");
+
+ expect(_file('tests/unit/utils/foo/bar-baz-test.js'))
+ .to.contain("import fooBarBaz from 'dummy/utils/foo/bar-baz';");
+ }));
});
-/**
-* Pod tests
-*
-*/
it('util foo-bar --pod', function() {
- return generateAndDestroy(['util', 'foo-bar', '--pod'], {
- files: [
- {
- file: 'app/utils/foo-bar.js',
- contains: 'export default function fooBar() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'my-app/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo-bar', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/utils/foo-bar.js'))
+ .to.contain('export default function fooBar() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'my-app/utils/foo-bar';");
+ }));
});
it('util foo-bar --pod podModulePrefix', function() {
- return generateAndDestroy(['util', 'foo-bar', '--pod'], {
- podModulePrefix: true,
- files: [
- {
- file: 'app/utils/foo-bar.js',
- contains: 'export default function fooBar() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'my-app/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo-bar', '--pod'];
+
+ return emberNew()
+ .then(() => setupPodConfig({ podModulePrefix: true }))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/utils/foo-bar.js'))
+ .to.contain('export default function fooBar() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'my-app/utils/foo-bar';");
+ }));
});
it('util foo-bar/baz --pod', function() {
- return generateAndDestroy(['util', 'foo/bar-baz', '--pod'], {
- files: [
- {
- file: 'app/utils/foo/bar-baz.js',
- contains: 'export default function fooBarBaz() {\n' +
- ' return true;\n' +
- '}'
- },
- {
- file: 'tests/unit/utils/foo/bar-baz-test.js',
- contains: [
- "import fooBarBaz from 'my-app/utils/foo/bar-baz';"
- ]
- }
- ]
- });
+ var args = ['util', 'foo/bar-baz', '--pod'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('app/utils/foo/bar-baz.js'))
+ .to.contain('export default function fooBarBaz() {\n' +
+ ' return true;\n' +
+ '}');
+
+ expect(_file('tests/unit/utils/foo/bar-baz-test.js'))
+ .to.contain("import fooBarBaz from 'my-app/utils/foo/bar-baz';");
+ }));
});
it('util-test foo-bar', function() {
- return generateAndDestroy(['util-test', 'foo-bar'], {
- files: [
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'my-app/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util-test', 'foo-bar'];
+
+ return emberNew()
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'my-app/utils/foo-bar';");
+ }));
});
it('in-addon util-test foo-bar', function() {
- return generateAndDestroy(['util-test', 'foo-bar'], {
- target: 'addon',
- files: [
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import fooBar from 'dummy/utils/foo-bar';"
- ]
- }
- ]
- });
+ var args = ['util-test', 'foo-bar'];
+
+ return emberNew({ target: 'addon' })
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import fooBar from 'dummy/utils/foo-bar';");
+ }));
});
it('util-test foo-bar for mocha', function() {
- return generateAndDestroy(['util-test', 'foo-bar'], {
- packages: [
- { name: 'ember-cli-qunit', delete: true },
- { name: 'ember-cli-mocha', dev: true }
- ],
- files: [
- {
- file: 'tests/unit/utils/foo-bar-test.js',
- contains: [
- "import { describe, it } from 'mocha';",
- "import fooBar from 'my-app/utils/foo-bar';",
- "describe('Unit | Utility | foo bar', function() {"
- ]
- }
- ]
- });
+ var args = ['util-test', 'foo-bar'];
+
+ return emberNew()
+ .then(() => modifyPackages([
+ {name: 'ember-cli-qunit', delete: true},
+ {name: 'ember-cli-mocha', dev: true}
+ ]))
+ .then(() => emberGenerateDestroy(args, _file => {
+ expect(_file('tests/unit/utils/foo-bar-test.js'))
+ .to.contain("import { describe, it } from 'mocha';")
+ .to.contain("import fooBar from 'my-app/utils/foo-bar';")
+ .to.contain("describe('Unit | Utility | foo bar', function() {");
+ }));
});
}); | true |
Other | emberjs | ember.js | 396dd7f11c7551d3250c38909f333904cd85f14e.json | Remove extra comments and empty test. | packages/ember-glimmer/lib/helpers/get.js | @@ -52,7 +52,6 @@ import { isConst } from 'glimmer-reference';
export default {
isInternalHelper: true,
- // toReference(args) {
toReference(args) {
let sourceReference = args.positional.at(0);
@@ -64,7 +63,4 @@ export default {
return new GetHelperReference(sourceReference, propertyPathReference);
}
}
- // return new GetHelperReference(args);
- // }
};
- | true |
Other | emberjs | ember.js | 396dd7f11c7551d3250c38909f333904cd85f14e.json | Remove extra comments and empty test. | packages/ember-glimmer/tests/integration/helpers/get-test.js | @@ -334,4 +334,3 @@ moduleFor('Helpers test: {{get}}', class extends RenderingTest {
this.assert.strictEqual(get(this.context, 'source.banana'), 'some value');
}
});
- | true |
Other | emberjs | ember.js | 4c981bac1f040dc961d4c0b51f16ef337c39ae48.json | Remove legacy get helper test | packages/ember-htmlbars/tests/helpers/get_test.js | @@ -1,136 +0,0 @@
-import Ember from 'ember-metal/core';
-import EmberObject from 'ember-runtime/system/object';
-import run from 'ember-metal/run_loop';
-import compile from 'ember-template-compiler/system/compile';
-import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
-import EmberView from 'ember-views/views/view';
-import ComponentLookup from 'ember-views/component_lookup';
-import TextField from 'ember-views/views/text_field';
-import buildOwner from 'container/tests/test-helpers/build-owner';
-import { OWNER } from 'container/owner';
-
-var view, owner;
-
-import isEnabled from 'ember-metal/features';
-if (!isEnabled('ember-glimmer')) {
- // jscs:disable
-
-QUnit.module('ember-htmlbars: {{get}} helper', {
- setup() {
- owner = buildOwner();
- owner.register('component:-text-field', TextField);
- owner.register('component-lookup:main', ComponentLookup);
- owner.registerOptionsForType('template', { instantiate: false });
- },
- teardown() {
- run(function() {
- Ember.TEMPLATES = {};
- });
- runDestroy(view);
- runDestroy(owner);
- owner = view = null;
- }
-});
-
-QUnit.test('get helper value should be updatable using {{input}} and (mut) - dynamic key', function() {
- var context = {
- source: EmberObject.create({
- banana: 'banana'
- }),
- key: 'banana'
- };
-
- view = EmberView.create({
- [OWNER]: owner,
- context: context,
- template: compile(`{{input type='text' value=(mut (get source key)) id='get-input'}}`)
- });
-
- runAppend(view);
-
- equal(view.$('#get-input').val(), 'banana');
-
- run(function() {
- view.set('context.source.banana', 'yellow');
- });
-
- equal(view.$('#get-input').val(), 'yellow');
-
- run(function() {
- view.$('#get-input').val('some value');
- view.childViews[0]._elementValueDidChange();
- });
-
- equal(view.$('#get-input').val(), 'some value');
- equal(view.get('context.source.banana'), 'some value');
-});
-
-QUnit.test('get helper value should be updatable using {{input}} and (mut) - dynamic nested key', function() {
- var context = {
- source: EmberObject.create({
- apple: {
- mcintosh: 'mcintosh'
- }
- }),
- key: 'apple.mcintosh'
- };
-
- view = EmberView.create({
- [OWNER]: owner,
- context: context,
- template: compile(`{{input type='text' value=(mut (get source key)) id='get-input'}}`)
- });
-
- runAppend(view);
-
- equal(view.$('#get-input').val(), 'mcintosh');
-
- run(function() {
- view.set('context.source.apple.mcintosh', 'red');
- });
-
- equal(view.$('#get-input').val(), 'red');
-
- run(function() {
- view.$('#get-input').val('some value');
- view.childViews[0]._elementValueDidChange();
- });
-
- equal(view.$('#get-input').val(), 'some value');
- equal(view.get('context.source.apple.mcintosh'), 'some value');
-});
-
-QUnit.test('get helper value should be updatable using {{input}} and (mut) - static key', function() {
- var context = {
- source: EmberObject.create({
- banana: 'banana'
- }),
- key: 'banana'
- };
-
- view = EmberView.create({
- [OWNER]: owner,
- context: context,
- template: compile(`{{input type='text' value=(mut (get source 'banana')) id='get-input'}}`)
- });
-
- runAppend(view);
-
- equal(view.$('#get-input').val(), 'banana');
-
- run(function() {
- view.set('context.source.banana', 'yellow');
- });
-
- equal(view.$('#get-input').val(), 'yellow');
-
- run(function() {
- view.$('#get-input').val('some value');
- view.childViews[0]._elementValueDidChange();
- });
-
- equal(view.$('#get-input').val(), 'some value');
- equal(view.get('context.source.banana'), 'some value');
-});
-
-} | false |
Other | emberjs | ember.js | a2f330cc5c7f61d1636eb4b13ad58d67cdc13001.json | Update emberjs-build to v0.6.4. | package.json | @@ -34,7 +34,7 @@
"ember-cli-sauce": "^1.4.2",
"ember-cli-yuidoc": "0.8.3",
"ember-publisher": "0.0.7",
- "emberjs-build": "0.6.3",
+ "emberjs-build": "0.6.4",
"express": "^4.5.0",
"finalhandler": "^0.4.0",
"github": "^0.2.3", | false |
Other | emberjs | ember.js | 679cc2edbd280c3d6d31a60b5cfbafab1839caef.json | Add v2.5.0-beta.3 to CHANGELOG.md.
[ci skip]
(cherry picked from commit 4c5d000ac0c557bfe0e1441d4bd98eaffdaeb484) | CHANGELOG.md | @@ -1,6 +1,9 @@
# Ember Changelog
-<<<<<<< HEAD
+### 2.5.0-beta.4 (April 3, 2016)
+
+- [#13169](https://github.com/emberjs/ember.js/pull/13169) [BUGFIX] Fixes {{link-to}} classes when transition is aborted
+
### 2.5.0-beta.3 (March 14, 2016)
- [#13083](https://github.com/emberjs/ember.js/issues/13083) [BUGFIX] Fix issue with feature flagging infrastructure in beta 2 | false |
Other | emberjs | ember.js | d601333063ee51992dcce4ca413dbde065f5e44d.json | Add 2.4.4 to CHANGELOG.md.
[ci skip]
(cherry picked from commit 5f88a0a0b7d5043ce56df67ee7c36908d4554c90) | CHANGELOG.md | @@ -1,5 +1,6 @@
# Ember Changelog
+<<<<<<< HEAD
### 2.5.0-beta.3 (March 14, 2016)
- [#13083](https://github.com/emberjs/ember.js/issues/13083) [BUGFIX] Fix issue with feature flagging infrastructure in beta 2
@@ -24,6 +25,14 @@
- [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
- [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
+### 2.4.4 (April 3, 2016)
+
+- [#13177](https://github.com/emberjs/ember.js/pull/13177) [BUGFIX] Allow contextual component attributes are mutable (allowing for two way binding).
+- [#13185](https://github.com/emberjs/ember.js/pull/13185) [BUGFIX] Ensure `{{render}}` sets up target properly (fixes issues with `{{render}}`'ed templates using actions).
+- [#13202](https://github.com/emberjs/ember.js/pull/13202) [BUGFIX] Merge in active transition QPs when doing a transition.
+- [#13218](https://github.com/emberjs/ember.js/pull/13218) [BUGFIX] Do not refresh routes on initial transition.
+- [#13228](https://github.com/emberjs/ember.js/pull/13228) [BUGFIX] re-enable link-to when disabledWhen changes values.
+
### 2.4.3 (March 17, 2016)
- [#13118](https://github.com/emberjs/ember.js/pull/13118) [BUGFIX] Work around Chrome 49/50 optimization bug affecting helper usage. | false |
Other | emberjs | ember.js | 28514094a4d9de75629cb4a1e42ba8159ce665c2.json | Add proper spacing between array items. | packages/ember-routing-htmlbars/tests/helpers/closure_action_test.js | @@ -559,7 +559,7 @@ QUnit.test('objects that define INVOKE can be casted to actions', function(asser
innerComponent = EmberComponent.extend({
fireAction() {
- assert.equal(this.attrs.submit(4,5,6), 123);
+ assert.equal(this.attrs.submit(4, 5, 6), 123);
}
}).create();
@@ -570,7 +570,7 @@ QUnit.test('objects that define INVOKE can be casted to actions', function(asser
submitTask: computed(function() {
return {
[INVOKE]: (...args) => {
- assert.deepEqual(args, [1,2,3,4,5,6]);
+ assert.deepEqual(args, [1, 2, 3, 4, 5, 6]);
return this.foo;
}
}; | false |
Other | emberjs | ember.js | 9945d946d3527685c437604c19060919adc5d03d.json | Add classBinding test | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -128,6 +128,18 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { 'class': classes('ember-view foo bar') }, content: 'hello' });
}
+ ['@htmlbars it should apply classBinding without condition always']() {
+ this.registerComponent('foo-bar', { template: 'hello' });
+
+ this.render('{{foo-bar classBinding=":foo"}}');
+
+ this.assertComponentElement(this.firstChild, { tagName: 'div', content: 'hello', attrs: {'class': classes('foo ember-view') } });
+
+ this.runTask(() => this.rerender());
+
+ this.assertComponentElement(this.firstChild, { tagName: 'div', content: 'hello', attrs: {'class': classes('foo ember-view') } });
+ }
+
['@htmlbars should not apply falsy class name']() {
this.registerComponent('foo-bar', { template: 'hello' });
| false |
Other | emberjs | ember.js | 58f181a376c11329f097dedee7690cb0c0f95bab.json | Add test around throwing on trying to change | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -19,7 +19,6 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { content: 'hello' });
}
- // Note this functionality seems weird
['@htmlbars it can have a custom id and it is not bound']() {
this.registerComponent('foo-bar', { template: '{{id}} {{elementId}}' });
@@ -42,6 +41,30 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { id: 'bizz' }, content: 'bizz bizz' });
}
+ ['@htmlbars elementId cannot change'](assert) {
+ let component;
+ let FooBarComponent = Component.extend({
+ elementId: 'blahzorz',
+ init() {
+ this._super(...arguments);
+ component = this;
+ }
+ });
+
+ this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: '{{elementId}}' });
+
+ this.render('{{foo-bar}}');
+
+ this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { id: 'blahzorz' }, content: 'blahzorz' });
+
+ // Note: Throws an `EmberError` that is not stripped from production builds
+ let willThrow = () => set(component, 'elementId', 'herpyderpy');
+
+ assert.throws(willThrow, /Changing a view's elementId after creation is not allowed/);
+
+ this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { id: 'blahzorz' }, content: 'blahzorz' });
+ }
+
['@test it can have a custom tagName']() {
let FooBarComponent = Component.extend({
tagName: 'foo-bar' | false |
Other | emberjs | ember.js | 1fc88025c5427f120d7f46d2ebeced70a0484681.json | Update NativeArray documentation
`NativeArray.activate` was removed several months ago, but the documentation for the mixin still recommends that method for activating it. This change updates the docs to suggest the same code that is used internally by the `NativeArray` mixin to apply itself to `Array.prototype`. | packages/ember-runtime/lib/system/native_array.js | @@ -23,7 +23,7 @@ import copy from 'ember-runtime/copy';
Array support Ember.MutableArray and all of its dependent APIs. Unless you
have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array` set to
false, this will be applied automatically. Otherwise you can apply the mixin
- at anytime by calling `Ember.NativeArray.activate`.
+ at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
@class NativeArray
@namespace Ember | false |
Other | emberjs | ember.js | 8c341bc1d3f311cadcddd61d021c1908e75e86e4.json | Fix deprecation for Ember.Handlebars.SafeString.
We have been trolled by exactly the same issue that has caused us to
deprecate `Ember.Handlebars.SafeString` to begin with. Invoking the
function doesn't actually work, we must instantiate a class (which is
not done by `deprecateFunc`).
:troll: | packages/ember-htmlbars/lib/compat.js | @@ -1,20 +1,25 @@
import Ember from 'ember-metal/core';
-import { deprecateFunc } from 'ember-metal/debug';
+import { htmlSafe } from 'ember-htmlbars/utils/string';
+import { deprecate } from 'ember-metal/debug';
import {
- SafeString,
escapeExpression
} from 'ember-htmlbars/utils/string';
var EmberHandlebars = Ember.Handlebars = Ember.Handlebars || {};
-EmberHandlebars.SafeString = deprecateFunc(
- 'Ember.Handlebars.SafeString is deprecated in favor of Ember.String.htmlSafe',
- {
- id: 'ember-htmlbars.ember-handlebars-safestring',
- until: '3.0.0',
- url: 'http://emberjs.com/deprecations/v2.x#toc_use-ember-string-htmlsafe-over-ember-handlebars-safestring'
- },
- SafeString);
+EmberHandlebars.SafeString = function(value) {
+ deprecate(
+ 'Ember.Handlebars.SafeString is deprecated in favor of Ember.String.htmlSafe',
+ false,
+ {
+ id: 'ember-htmlbars.ember-handlebars-safestring',
+ until: '3.0.0',
+ url: 'http://emberjs.com/deprecations/v2.x#toc_use-ember-string-htmlsafe-over-ember-handlebars-safestring'
+ }
+ );
+
+ return htmlSafe(value);
+};
EmberHandlebars.Utils = {
escapeExpression: escapeExpression | true |
Other | emberjs | ember.js | 8c341bc1d3f311cadcddd61d021c1908e75e86e4.json | Fix deprecation for Ember.Handlebars.SafeString.
We have been trolled by exactly the same issue that has caused us to
deprecate `Ember.Handlebars.SafeString` to begin with. Invoking the
function doesn't actually work, we must instantiate a class (which is
not done by `deprecateFunc`).
:troll: | packages/ember-htmlbars/tests/compat/safe_string_test.js | @@ -3,7 +3,11 @@ import EmberHandlebars from 'ember-htmlbars/compat';
QUnit.module('ember-htmlbars: compat - SafeString');
QUnit.test('using new results in a deprecation', function(assert) {
+ let result;
+
expectDeprecation(function() {
- new EmberHandlebars.SafeString('test');
+ result = new EmberHandlebars.SafeString('<b>test</b>');
}, 'Ember.Handlebars.SafeString is deprecated in favor of Ember.String.htmlSafe');
+
+ assert.equal(result.toHTML(), '<b>test</b>');
}); | true |
Other | emberjs | ember.js | 3f7bc1523cf6723d0e2c88acd1f8952c945a3588.json | show deprecation warning when using didInitAttrs | packages/ember-htmlbars/tests/integration/component_lifecycle_test.js | @@ -133,7 +133,9 @@ styles.forEach(style => {
twitter: '@tomdale'
}).create();
- runAppend(view);
+ expectDeprecation(() => {
+ runAppend(view);
+ }, /\[DEPRECATED\] didInitAttrs called in <\(subclass of Ember.Component\)\:ember[\d+]+>\./);
ok(component, 'The component was inserted');
equal(jQuery('#qunit-fixture').text(), 'Twitter: @tomdale Name: Tom Dale Website: tomdale.net');
@@ -285,7 +287,9 @@ styles.forEach(style => {
twitter: '@tomdale'
}).create();
- runAppend(view);
+ expectDeprecation(() => {
+ runAppend(view);
+ }, /\[DEPRECATED\] didInitAttrs called in <\(subclass of Ember.Component\)\:ember[\d+]+>\./);
ok(component, 'The component was inserted');
equal(jQuery('#qunit-fixture').text(), 'Top: Middle: Bottom: @tomdale');
@@ -361,7 +365,9 @@ styles.forEach(style => {
});
QUnit.test('changing a component\'s displayed properties inside didInsertElement() is deprecated', function(assert) {
- let component = style.class.extend({
+ let component;
+
+ component = style.class.extend({
[OWNER]: owner,
layout: compile('<div>{{handle}}</div>'),
handle: '@wycats',
@@ -382,6 +388,28 @@ styles.forEach(style => {
});
});
+ QUnit.test('DEPRECATED: didInitAttrs is deprecated', function(assert) {
+ let component;
+
+ let componentClass = style.class.extend({
+ [OWNER]: owner,
+ layout: compile('<div>{{handle}}</div>'),
+ handle: '@wycats',
+
+ didInitAttrs() {
+ this._super(...arguments);
+ }
+ });
+
+ expectDeprecation(() => {
+ component = componentClass.create();
+ }, /\[DEPRECATED\] didInitAttrs called in <\(subclass of Ember.Component\)\:ember[\d+]+>\./);
+
+ run(() => {
+ component.destroy();
+ });
+ });
+
QUnit.test('properties set during `init` are availabe in `didReceiveAttrs`', function(assert) {
assert.expect(1);
| true |
Other | emberjs | ember.js | 3f7bc1523cf6723d0e2c88acd1f8952c945a3588.json | show deprecation warning when using didInitAttrs | packages/ember-metal/lib/events.js | @@ -12,6 +12,7 @@ import {
applyStr
} from 'ember-metal/utils';
import { meta as metaFor, peekMeta } from 'ember-metal/meta';
+import { deprecate } from 'ember-metal/debug';
import { ONCE, SUSPENDED } from 'ember-metal/meta_listeners';
@@ -84,6 +85,18 @@ export function accumulateListeners(obj, eventName, otherActions) {
export function addListener(obj, eventName, target, method, once) {
assert('You must pass at least an object and event name to Ember.addListener', !!obj && !!eventName);
+ if (eventName === 'didInitAttrs' && obj.isComponent) {
+ deprecate(
+ `[DEPRECATED] didInitAttrs called in ${obj.toString()}.`,
+ false,
+ {
+ id: 'ember-views.did-init-attrs',
+ until: '3.0.0',
+ url: 'http://emberjs.com/deprecations/v2.x#toc_ember-component-didinitattrs'
+ }
+ );
+ }
+
if (!method && 'function' === typeof target) {
method = target;
target = null; | true |
Other | emberjs | ember.js | 3f7bc1523cf6723d0e2c88acd1f8952c945a3588.json | show deprecation warning when using didInitAttrs | packages/ember-metal/tests/events_test.js | @@ -1,5 +1,6 @@
import { Mixin } from 'ember-metal/mixin';
import { meta } from 'ember-metal/meta';
+import Component from 'ember-views/components/component';
import {
on,
@@ -258,3 +259,11 @@ QUnit.test('a listener added as part of a mixin may be overridden', function() {
sendEvent(obj, 'baz');
equal(triggered, 1, 'should invoke from subclass property');
});
+
+QUnit.test('DEPRECATED: adding didInitAttrs as a listener is deprecated', function() {
+ var obj = Component.create();
+
+ expectDeprecation(() => {
+ addListener(obj, 'didInitAttrs');
+ }, /\[DEPRECATED\] didInitAttrs called in <\Ember.Component\:ember[\d+]+>\./);
+}); | true |
Other | emberjs | ember.js | 3f7bc1523cf6723d0e2c88acd1f8952c945a3588.json | show deprecation warning when using didInitAttrs | packages/ember-views/lib/mixins/view_support.js | @@ -630,6 +630,18 @@ export default Mixin.create({
this[INIT_WAS_CALLED] = true;
+ if (typeof(this.didInitAttrs) === 'function') {
+ deprecate(
+ `[DEPRECATED] didInitAttrs called in ${this.toString()}.`,
+ false,
+ {
+ id: 'ember-views.did-init-attrs',
+ until: '3.0.0',
+ url: 'http://emberjs.com/deprecations/v2.x#toc_ember-component-didinitattrs'
+ }
+ );
+ }
+
assert(
'Using a custom `.render` function is no longer supported.',
!this.render | true |
Other | emberjs | ember.js | 02e3f0a00c78174ce6cc24bf6e7fe0d83a89c7d6.json | remove reference to dprecation (no longer applies) | packages/ember-runtime/lib/mixins/array.js | @@ -540,8 +540,7 @@ export default Mixin.create(Enumerable, {
return an enumerable that maps automatically to the named key on the
member objects.
- @each should only be used in a non-terminal context, and is deprecated when
- used as a leaf node. Example:
+ @each should only be used in a non-terminal context. Example:
```javascript
myMethod: computed('posts.@each.author', function(){ | false |
Other | emberjs | ember.js | 3605c774d409b309e8e75aa70199ca431dee0b4c.json | Add noop appendChild to OutletView.
This is certainly not correct, but unblocks a few tests. | packages/ember-glimmer/lib/ember-routing-view/index.js | @@ -98,6 +98,8 @@ export class OutletView {
}
}
+ appendChild() { }
+
rerender() {
if (this._renderResult) { this.renderer.rerender(this); }
} | false |
Other | emberjs | ember.js | 952efd0e1d6f1d205123f959d8679fd6e98ea1d1.json | Add support for `Component.prototype.layout`. | packages/ember-application/lib/system/application.js | @@ -1135,6 +1135,8 @@ function glimmerSetupRegistry(registry) {
});
let glimmerOutletTemplate = require('ember-glimmer/templates/outlet').default;
+ let glimmerComponentTemplate = require('ember-glimmer/templates/component').default;
+ registry.register(P`template:components/-default`, glimmerComponentTemplate);
registry.register('template:-outlet', glimmerOutletTemplate);
registry.injection('view:-outlet', 'template', 'template:-outlet');
registry.injection('template', 'env', 'service:-glimmer-environment'); | true |
Other | emberjs | ember.js | 952efd0e1d6f1d205123f959d8679fd6e98ea1d1.json | Add support for `Component.prototype.layout`. | packages/ember-glimmer/lib/utils/lookup-component.js | @@ -1,9 +1,26 @@
import isEnabled from 'ember-metal/features';
+import { privatize as P } from 'container/registry';
+
+const DEFAULT_LAYOUT = P`template:components/-default`;
function lookupComponentPair(componentLookup, owner, name, options) {
+ let component = componentLookup.componentFor(name, owner, options);
+ let layout = componentLookup.layoutFor(name, owner, options);
+
+ if (!layout && component) {
+ let layoutProp = component.proto().layout;
+ if (layoutProp) {
+ let templateFullName = 'template:components/' + name;
+ owner.register(templateFullName, layoutProp);
+ layout = owner.lookup(templateFullName, options);
+ } else {
+ layout = owner.lookup(DEFAULT_LAYOUT);
+ }
+ }
+
return {
- component: componentLookup.componentFor(name, owner, options),
- layout: componentLookup.layoutFor(name, owner, options)
+ component,
+ layout
};
}
| true |
Other | emberjs | ember.js | d2a4f10f77e75f48453de49f5eb85c32fd33d625.json | Parse JSON only when template is needed. | packages/ember-template-compiler/lib/system/template.js | @@ -51,12 +51,10 @@ if (isEnabled('ember-glimmer')) {
}
template = function(json) {
- let spec = JSON.parse(json);
-
return class extends Wrapper {
constructor(options) {
super(options);
- this.spec = spec;
+ this.spec = JSON.parse(json);
}
};
}; | false |
Other | emberjs | ember.js | 58b5084f341f1b8bc6d1e974195f135ca2f8d0d7.json | Use assertStableRerender helper in a few places | packages/ember-glimmer/tests/integration/content-test.js | @@ -75,10 +75,7 @@ class DynamicContentTest extends RenderingTest {
this.assertText('hello');
- // FIXME: use @mmun's assertStableRerender
- this.takeSnapshot();
- this.runTask(() => this.rerender());
- this.assertInvariants();
+ this.assertStableRerender();
this.runTask(() => set(this.context, 'message', 'goodbye'));
@@ -98,10 +95,7 @@ class DynamicContentTest extends RenderingTest {
this.assertText('hello');
- // FIXME: use @mmun's assertStableRerender
- this.takeSnapshot();
- this.runTask(() => this.rerender());
- this.assertInvariants();
+ this.assertStableRerender();
this.runTask(() => set(this.context, 'a.b.c.d.e.f', 'goodbye'));
@@ -136,10 +130,7 @@ class DynamicContentTest extends RenderingTest {
this.assertText('HELLO');
- // FIXME: use @mmun's assertStableRerender
- this.takeSnapshot();
- this.runTask(() => this.rerender());
- this.assertInvariants();
+ this.assertStableRerender();
this.runTask(() => set(m, 'message', 'goodbye'));
@@ -192,10 +183,7 @@ class ContentTestGenerator {
this.assertText(expected);
- // FIXME: use @mmun's assertStableRerender
- this.takeSnapshot();
- this.runTask(() => this.rerender());
- this.assertInvariants();
+ this.assertStableRerender();
this.runTask(() => set(this.context, 'value', 'hello'));
| false |
Other | emberjs | ember.js | 6a58171a27393cb5719dcaa52ac49c56611c2e48.json | Add assertStableRerender rendering test helper | packages/ember-glimmer/tests/utils/abstract-test-case.js | @@ -163,6 +163,12 @@ export class TestCase {
this.assertSameNode(newSnapshot[i], oldSnapshot[i]);
}
}
+
+ assertStableRerender() {
+ this.takeSnapshot();
+ this.runTask(() => this.rerender());
+ this.assertInvariants();
+ }
}
function isMarker(node) { | false |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-glimmer/lib/components/curly-component.js | @@ -75,7 +75,7 @@ class CurlyComponentManager {
const MANAGER = new CurlyComponentManager();
import { ComponentDefinition, ValueReference } from 'glimmer-runtime';
-import Component from 'ember-views/components/component';
+import Component from '../ember-views/component';
function elementId(vm) {
let component = vm.dynamicScope().view; | true |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-glimmer/lib/ember-views/child-views-support.js | @@ -0,0 +1,73 @@
+/**
+@module ember
+@submodule ember-views
+*/
+import { Mixin } from 'ember-metal/mixin';
+import { getOwner, setOwner, OWNER } from 'container/owner';
+
+export default Mixin.create({
+ init() {
+ this._super(...arguments);
+
+ /**
+ Array of child views. You should never edit this array directly.
+ Instead, use `appendChild` and `removeFromParent`.
+
+ @property childViews
+ @type Array
+ @default []
+ @private
+ */
+ this.childViews = [];
+ this.parentView = null;
+ this.ownerView = this.ownerView || this;
+ },
+
+ appendChild(view) {
+ this.linkChild(view);
+ this.childViews.push(view);
+ },
+
+ destroyChild(view) {
+ view.destroy();
+ },
+
+ /**
+ Removes the child view from the parent view.
+
+ @method removeChild
+ @param {Ember.View} view
+ @return {Ember.View} receiver
+ @private
+ */
+ removeChild(view) {
+ // If we're destroying, the entire subtree will be
+ // freed, and the DOM will be handled separately,
+ // so no need to mess with childViews.
+ if (this.isDestroying) { return; }
+
+ // update parent node
+ this.unlinkChild(view);
+
+ // remove view from childViews array.
+ let { childViews } = this;
+
+ let index = childViews.indexOf(view);
+ if (index !== -1) { childViews.splice(index, 1); }
+
+ return this;
+ },
+
+ linkChild(instance) {
+ if (!instance[OWNER]) {
+ setOwner(instance, getOwner(this));
+ }
+
+ instance.parentView = this;
+ instance.ownerView = this.ownerView;
+ },
+
+ unlinkChild(instance) {
+ instance.parentView = null;
+ }
+}); | true |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-glimmer/lib/ember-views/component.js | @@ -0,0 +1,26 @@
+import CoreView from 'ember-views/views/core_view';
+import ChildViewsSupport from './child-views-support';
+import ViewStateSupport from 'ember-views/mixins/view_state_support';
+import ClassNamesSupport from 'ember-views/mixins/class_names_support';
+import InstrumentationSupport from 'ember-views/mixins/instrumentation_support';
+import AriaRoleSupport from 'ember-views/mixins/aria_role_support';
+import ViewMixin from 'ember-views/mixins/view_support';
+import EmberView from 'ember-views/views/view';
+
+export default CoreView.extend(
+ ChildViewsSupport,
+ ViewStateSupport,
+ ClassNamesSupport,
+ InstrumentationSupport,
+ AriaRoleSupport,
+ ViewMixin, {
+ isComponent: true,
+ template: null,
+ layoutName: null,
+ layout: null,
+
+ init() {
+ this._super(...arguments);
+ this._viewRegistry = this._viewRegistry || EmberView.views;
+ }
+ }); | true |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-glimmer/tests/utils/abstract-test-case.js | @@ -1,10 +1,9 @@
import packageName from './package-name';
import Environment from './environment';
-import { compile, helper, Helper, DOMHelper, Renderer } from './helpers';
+import { compile, helper, Helper, Component, DOMHelper, Renderer } from './helpers';
import { equalsElement, equalTokens, regex, classes } from './test-helpers';
import run from 'ember-metal/run_loop';
import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
-import Component from 'ember-views/components/component';
import jQuery from 'ember-views/system/jquery';
import assign from 'ember-metal/assign';
import Application from 'ember-application/system/application'; | true |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-glimmer/tests/utils/helpers.js | @@ -1,4 +1,5 @@
export { default as Helper, helper } from 'ember-glimmer/helper';
+export { default as Component } from 'ember-glimmer/ember-views/component';
export { DOMHelper } from 'glimmer-runtime';
export { Renderer } from 'ember-glimmer/ember-metal-views';
export { default as compile } from 'ember-glimmer/ember-template-compiler/system/compile'; | true |
Other | emberjs | ember.js | d1f8126951179f00614c1ebc5217dfec4d7dee8a.json | Do less work when creating Components in glimmer
We starting noticing that there are quite a bit of work we do in
Components init that are not needed in Glimmer, so we tried to make a
slimmer version. When we eventually get to feature-flagging, we can
conditionally export the right class. We will probably need to add more
stuff as we go (or perhaps we can remove more work), but this is a good
start. | packages/ember-htmlbars/tests/utils/helpers.js | @@ -1,4 +1,5 @@
export { default as Helper, helper } from 'ember-htmlbars/helper';
export { default as DOMHelper } from 'ember-htmlbars/system/dom-helper';
+export { default as Component } from 'ember-views/components/component';
export { Renderer } from 'ember-metal-views';
export { default as compile } from 'ember-template-compiler/system/compile'; | true |
Other | emberjs | ember.js | 5641c3089180bdd1d4fa54e9dd2d3ac285f088e4.json | Add v2.3.2 to CHANGELOG.
[ci skip] | CHANGELOG.md | @@ -65,7 +65,11 @@
- [#12664](https://github.com/emberjs/ember.js/pull/12664) Include NaN as a falsey value in the `with` helper's docstring
- [#12698](https://github.com/emberjs/ember.js/pull/12698) convert all this._super.apply(this, arguments) to this._super(...arguments)
-### 2.3.1 (February 4, 2016)
+### v2.3.2 (March 17, 2016)
+
+- [#13118](https://github.com/emberjs/ember.js/pull/13118) [BUGFIX] Work around Chrome 49/50 optimization bug affecting helper usage.
+
+### v2.3.1 (February 4, 2016)
- [#12829](https://github.com/emberjs/ember.js/pull/12829) [BUGFIX] Support tagless components in fastboot.
- [#12848](https://github.com/emberjs/ember.js/pull/12848) Make dependencies that end in `@each` expand to `[]`. | false |
Other | emberjs | ember.js | b7bb71bb2812c75309058d110771c7117ad42925.json | Update CHANGELOG for 2.4.3.
[ci skip] | CHANGELOG.md | @@ -24,6 +24,10 @@
- [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
- [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
+### 2.4.3 (March 17, 2016)
+
+- [#13118](https://github.com/emberjs/ember.js/pull/13118) [BUGFIX] Work around Chrome 49/50 optimization bug affecting helper usage.
+
### 2.4.2 (March 8, 2016)
- [#13031](https://github.com/emberjs/ember.js/pull/13031) [BUGFIX] Fix mergedProperties at create time modifying proto | false |
Other | emberjs | ember.js | bbaf6c0e82f5610d4ade73b15189bd4114c69ac2.json | Add missing bower installation steps | README.md | @@ -16,9 +16,10 @@ on building killer features and UI.
# Building Ember.js
-1. Ensure that [Node.js](http://nodejs.org/) is installed.
+1. Ensure that [Node.js](http://nodejs.org/) and [bower](http://bower.io/) are installed.
2. Run `npm install` to ensure the required dependencies are installed.
-3. Run `npm run build` to build Ember.js. The builds will be placed in the `dist/` directory.
+3. Run `bower install` to ensure required web dependencies are installed.
+4. Run `npm run build` to build Ember.js. The builds will be placed in the `dist/` directory.
## npm install troubleshooting
| false |
Other | emberjs | ember.js | 4809c665a40e899ced5a4aee7659253e3f6ccb12.json | build emberjs-build to fix minify | package.json | @@ -34,7 +34,7 @@
"ember-cli-sauce": "^1.4.2",
"ember-cli-yuidoc": "0.8.3",
"ember-publisher": "0.0.7",
- "emberjs-build": "0.6.1",
+ "emberjs-build": "0.6.2",
"express": "^4.5.0",
"finalhandler": "^0.4.0",
"github": "^0.2.3", | false |
Other | emberjs | ember.js | dedb9683fa97dfbb0ec28f71f99fea9ffbfce92e.json | Fix testem.json to quote url substitution.
Testem just does a `replace('<url>', testUrl)` on the command, so `&`
was being interpreted by the command shell, clipping test_page to
"tests/index.html?hidepassed" | testem.dist.json | @@ -6,35 +6,35 @@
"disable_watching": true,
"launchers": {
"SL_Chrome_Current": {
- "command": "npm run sauce:launch -- -b chrome -v latest --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b chrome -v latest --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_Firefox_Current": {
- "command": "npm run sauce:launch -- -b firefox -v latest --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b firefox -v latest --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_Safari_Current": {
- "command": "npm run sauce:launch -- -b safari -v 8 --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b safari -v 8 --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_Safari_Last": {
- "command": "npm run sauce:launch -- -b safari -v 7 --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b safari -v 7 --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_MS_Edge": {
- "command": "npm run sauce:launch -- -b 'microsoftedge' --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b 'microsoftedge' --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_IE_11": {
- "command": "npm run sauce:launch -- -b 'internet explorer' -v 11 --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b 'internet explorer' -v 11 --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_IE_10": {
- "command": "npm run sauce:launch -- -b 'internet explorer' -v 10 --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b 'internet explorer' -v 10 --no-ct -u '<url>'",
"protocol": "tap"
},
"SL_IE_9": {
- "command": "npm run sauce:launch -- -b 'internet explorer' -v 9 --no-ct -u <url>",
+ "command": "npm run sauce:launch -- -b 'internet explorer' -v 9 --no-ct -u '<url>'",
"protocol": "tap"
}
}, | false |
Other | emberjs | ember.js | 551f4626233299d01abe58368b7f84ec3ea2970d.json | Add 2.4.2 to CHANGELOG | CHANGELOG.md | @@ -20,6 +20,11 @@
- [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
- [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
+### 2.4.2 (March 8, 2016)
+
+- [#13031](https://github.com/emberjs/ember.js/pull/13031) [BUGFIX] Fix mergedProperties at create time modifying proto
+- [#13049](https://github.com/emberjs/ember.js/pull/13049) [BUGFIX] Fixes `{{#with proxy as |foo|}}`
+
### 2.4.1 (February 29, 2016)
- [#13030](https://github.com/emberjs/ember.js/pull/13030) [BUGFIX] Fix legacy addon deprecations | false |
Other | emberjs | ember.js | e6de34d152b64c989a44f24cd7cd4cde63f94a9e.json | Add 2.4.1 to changelog | CHANGELOG.md | @@ -20,6 +20,10 @@
- [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
- [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
+### 2.4.1 (February 29, 2016)
+
+- [#13030](https://github.com/emberjs/ember.js/pull/13030) [BUGFIX] Fix legacy addon deprecations
+
### 2.4.0 (February 29, 2016)
- [#12996](https://github.com/emberjs/ember.js/pull/12996) [BUGFIX] Fixes 12995 #with array yields true | false |
Other | emberjs | ember.js | b77724d2c6f5ff19137cf1292febaf91436b2822.json | Improve CHANGELOG script to auto-detect HEAD | bin/changelog | @@ -20,7 +20,7 @@ var execSync = require('child_process').execSync;
var github = new GitHubApi({version: '3.0.0'});
var compareCommits = RSVP.denodeify(github.repos.compareCommits);
var currentVersion = process.env.PRIOR_VERSION;
-var head = process.env.HEAD || 'master';
+var head = process.env.HEAD || execSync('git rev-parse HEAD', { encoding: 'UTF-8' });
compareCommits({
user: 'emberjs', | false |
Other | emberjs | ember.js | b4c0fa766fbb07dfb936a2d53892747deb8c4f06.json | Fix typo in ember-api documentation | packages/ember-routing/lib/system/route.js | @@ -1923,7 +1923,7 @@ var Route = EmberObject.extend(ActionHandler, Evented, {
//
this.render('post', { // the template name associated with 'post' Route
into: 'application', // the parent route to 'post' Route
- outlet: 'main', // {{outlet}} and {{outlet 'main' are synonymous}},
+ outlet: 'main', // {{outlet}} and {{outlet 'main'}} are synonymous,
view: 'post', // the view associated with the 'post' Route
controller: 'post', // the controller associated with the 'post' Route
}) | false |
Other | emberjs | ember.js | 7a435127f2841a052095c1d42a7b629900ea0120.json | Add blueprint dependencies | package.json | @@ -45,5 +45,13 @@
"serve-static": "^1.10.0",
"simple-dom": "^0.2.7",
"testem": "^1.0.0-rc.3"
+ },
+ "dependencies": {
+ "ember-cli-get-component-path-option": "^1.0.0",
+ "ember-cli-normalize-entity-name": "^1.0.0",
+ "ember-cli-path-utils": "^1.0.0",
+ "ember-cli-string-utils": "^1.0.0",
+ "ember-cli-test-info": "^1.0.0",
+ "ember-cli-valid-component-name": "^1.0.0"
}
} | false |
Other | emberjs | ember.js | 913913ac922d36be0ccf67803ca32765b328a6ef.json | Add failing test cases for glimmer 2 conditionals | packages/ember-glimmer/tests/utils/shared-conditional-tests.js | @@ -530,7 +530,7 @@ export class SharedSyntaxConditionalsTest extends SharedConditionalsTest {
}
['@test it tests for `isTruthy` on the context if available']() {
- let template = this.templateFor({ cond: 'this', truthy: 'T1', falsy: 'F1' });
+ let template = this.wrappedTemplateFor({ cond: 'this', truthy: 'T1', falsy: 'F1' });
this.render(template, { isTruthy: true });
@@ -549,4 +549,91 @@ export class SharedSyntaxConditionalsTest extends SharedConditionalsTest {
this.assertText('T1');
}
+ ['@htmlbars it updates correctly when enclosing another conditional']() {
+ // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
+ let template = this.wrappedTemplateFor({ cond: 'outer', truthy: '{{#if inner}}T-inner{{else}}F-inner{{/if}}', falsy: 'F-outer' });
+
+ this.render(template, { outer: true, inner: true });
+
+ this.assertText('T-inner');
+
+ this.runTask(() => this.rerender());
+
+ this.assertText('T-inner');
+
+ // Changes the inner bounds
+ this.runTask(() => set(this.context, 'inner', false));
+
+ this.assertText('F-inner');
+
+ // Now rerender the outer conditional, which require first clearing its bounds
+ this.runTask(() => set(this.context, 'outer', false));
+
+ this.assertText('F-outer');
+ }
+
+ ['@htmlbars it updates correctly when enclosing #each']() {
+ // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
+ let template = this.wrappedTemplateFor({ cond: 'outer', truthy: '{{#each inner as |text|}}{{text}}{{/each}}', falsy: 'F-outer' });
+
+ this.render(template, { outer: true, inner: ['inner', '-', 'before'] });
+
+ this.assertText('inner-before');
+
+ this.runTask(() => this.rerender());
+
+ this.assertText('inner-before');
+
+ // Changes the inner bounds
+ this.runTask(() => set(this.context, 'inner', ['inner-after']));
+
+ this.assertText('inner-after');
+
+ // Now rerender the outer conditional, which require first clearing its bounds
+ this.runTask(() => set(this.context, 'outer', false));
+
+ this.assertText('F-outer');
+
+ // Reset
+ this.runTask(() => {
+ set(this.context, 'inner', ['inner-again']);
+ set(this.context, 'outer', true);
+ });
+
+ this.assertText('inner-again');
+
+ // Now clear the inner bounds
+ this.runTask(() => set(this.context, 'inner', []));
+
+ this.assertText('');
+
+ // Now rerender the outer conditional, which require first clearing its bounds
+ this.runTask(() => set(this.context, 'outer', false));
+
+ this.assertText('F-outer');
+ }
+
+ ['@htmlbars it updates correctly when enclosing triple-curlies']() {
+ // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
+ let template = this.wrappedTemplateFor({ cond: 'outer', truthy: '{{{inner}}}', falsy: 'F-outer' });
+
+ this.render(template, { outer: true, inner: '<b>inner</b>-<b>before</b>' });
+
+ this.assertText('inner-before');
+
+ this.runTask(() => this.rerender());
+
+ this.assertText('inner-before');
+
+ // Changes the inner bounds
+ this.runTask(() => set(this.context, 'inner', '<p>inner-after</p>'));
+
+ this.assertText('inner-after');
+
+ // Now rerender the outer conditional, which require first clearing its bounds
+ this.runTask(() => set(this.context, 'outer', false));
+
+ this.assertText('F-outer');
+ }
+
} | false |
Other | emberjs | ember.js | dd6a1bdbd0a05a06d7e388052c5760c6336b1012.json | Update CHANGELOG for 2.4/2.5 releases. | CHANGELOG.md | @@ -1,7 +1,61 @@
# Ember Changelog
-### v2.3.0-beta.3 (December 19, 2015)
-
+### 2.5.0-beta.1
+
+- [#12829](https://github.com/emberjs/ember.js/pull/12829) [BUGFIX] Support tagless components in fastboot
+- [#12575](https://github.com/emberjs/ember.js/pull/12575) Make acceptance helpers fire native evets instead of jQuery ones.
+- [#12888](https://github.com/emberjs/ember.js/pull/12888) Add assertion for {{#each foo in bar}} syntax
+- [#12938](https://github.com/emberjs/ember.js/pull/12938) Expose `Router#transitionTo` as a public method
+- [#12929](https://github.com/emberjs/ember.js/pull/12929) [BUGFIX] Fix bug causing an initial capital to be interpreted as a global.
+- [#12928](https://github.com/emberjs/ember.js/pull/12928) [FEATURE ember-htmlbars-component-generation] Remove feature.
+- [#12998](https://github.com/emberjs/ember.js/pull/12998) Make "calling set on destroyed object" error more descriptive.
+- [#13007](https://github.com/emberjs/ember.js/pull/13007) [BUGFIX] Update Ember.compare to use operators
+- [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
+- [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
+
+### 2.4.0
+
+- [#12996](https://github.com/emberjs/ember.js/pull/12996) [BUGFIX] Fixes 12995 #with array yields true
+- [#13013](https://github.com/emberjs/ember.js/pull/13013) [BUGFIX] Do not set model on `{{render}}` rerender when only a single argument was provided.
+- [#13015](https://github.com/emberjs/ember.js/pull/13015) Add deprecation when legacy addon flag is enabled.
+- [#12922](https://github.com/emberjs/ember.js/pull/12922) [BUGFIX] Special case `{{#with}}` for `isTruthy`
+- [#12934](https://github.com/emberjs/ember.js/pull/12934) [BUGFIX] Ensure `Route#transitionTo` returns a `Transition` object.
+- [#12941](https://github.com/emberjs/ember.js/pull/12941) [BUGFIX] Update Backburner to latest ([compare view](https://github.com/ebryn/backburner.js/compare/22a4df33f23c40257bc49972e5833038452ded2e...325a969dbc7eae42dc1edfbf0ae9fb83923df5a6)).
+- [#12939](https://github.com/emberjs/ember.js/pull/12939) [BUGFIX] Avoid allocating a binding map in meta when possible.
+- [#12947](https://github.com/emberjs/ember.js/pull/12947) [BUGFIX] Avoid using prototype extensions if possible ({add,remove}ArrayObserver).
+- [#12942](https://github.com/emberjs/ember.js/pull/12942) [BUGFIX] Do not rely prototype extensions (objectAt).
+- [#12991](https://github.com/emberjs/ember.js/pull/12991) [BUGFIX] Fix a regression in `Ember.computed.sort`.
+- [#12491](https://github.com/emberjs/ember.js/pull/12491) [BUGFIX] allow watching of ES5+ Getter
+- [#12829](https://github.com/emberjs/ember.js/pull/12829) [BUGFIX] Support tagless components in fastboot
+- [#12847](https://github.com/emberjs/ember.js/pull/12847) [BUGFIX] Add warning for “deep @each” usage in dependent keys.
+- [#12848](https://github.com/emberjs/ember.js/pull/12848) Make dependencies that end in `@each` expand to `[]`.
+- [#12877](https://github.com/emberjs/ember.js/pull/12877) [BUGFIX] Upgrade htmlbars to 0.14.14. Fixes bug with lost cursor position with `<input oninput={{action 'foo'}}>`.
+- [#12908](https://github.com/emberjs/ember.js/pull/12908) [BUGFIX] Fix issue that prevented recomputation of `ArrayProxy` values under certain circumstances.
+- [#12348](https://github.com/emberjs/ember.js/pull/12348) Route#disconnectOutlet should not be private
+- [#12648](https://github.com/emberjs/ember.js/pull/12648) Move `packages/**/lib/main.js` to `packages/**/lib/index.js`.
+- [#12647](https://github.com/emberjs/ember.js/pull/12647) update cli
+- [#12638](https://github.com/emberjs/ember.js/pull/12638) Update references to find methods
+- [#12757](https://github.com/emberjs/ember.js/pull/12757) Update build related deps.
+- [#12662](https://github.com/emberjs/ember.js/pull/12662) correction for Ember.String.capitalize docs
+- [#12674](https://github.com/emberjs/ember.js/pull/12674) removed unused `name` prop
+- [#12664](https://github.com/emberjs/ember.js/pull/12664) Include NaN as a falsey value in the `with` helper's docstring
+- [#12698](https://github.com/emberjs/ember.js/pull/12698) convert all this._super.apply(this, arguments) to this._super(...arguments)
+
+### 2.3.1 (February 4, 2016)
+
+- [#12829](https://github.com/emberjs/ember.js/pull/12829) [BUGFIX] Support tagless components in fastboot.
+- [#12848](https://github.com/emberjs/ember.js/pull/12848) Make dependencies that end in `@each` expand to `[]`.
+- [#12877](https://github.com/emberjs/ember.js/pull/12877) [BUGFIX] Upgrade htmlbars to 0.14.14. Fixes bug with lost cursor position with `<input oninput={{action 'foo'}}>`.
+- [#12908](https://github.com/emberjs/ember.js/pull/12908) [BUGFIX] Fix issue that prevented recomputation of `ArrayProxy` values under certain circumstances.
+
+
+### 2.3.0 (January 17, 2016)
+
+- [#12712](https://github.com/emberjs/ember.js/pull/12712) [BUGFIX] Create a new hash parameter when creating a component cell
+- [#12746](https://github.com/emberjs/ember.js/pull/12746) [BUGFIX] Update htmlbars to 0.14.11 to fix [CVE-2015-7565](http://emberjs.com/blog/2016/01/14/security-releases-ember-1-11-4-1-12-2-1-13-12-2-0-3-2-1-2-2-2-1.html).
+- [#12752](https://github.com/emberjs/ember.js/pull/12752) [BUGFIX] Do not re-raise on errors handled in route error action.
+- [#12764](https://github.com/emberjs/ember.js/pull/12764) [BUGFIX] Read values of `action` helper parameters
+- [#12793](https://github.com/emberjs/ember.js/pull/12793) [BUGFIX] Remove jQuery version assertion.
- [#12659](https://github.com/emberjs/ember.js/pull/12659) [BUGFIX] Update HTMLBars to 0.14.7.
- [#12666](https://github.com/emberjs/ember.js/pull/12666) [BUGFIX] Prevent triggering V8 memory leak bug through registry / resolver access.
- [#12677](https://github.com/emberjs/ember.js/pull/12677) [BUGFIX] Remove FastBoot monkeypatches.
@@ -12,9 +66,6 @@
- [#12705](https://github.com/emberjs/ember.js/pull/12705) [BUGFIX] Fix FastBoot URL parsing crash.
- [#12728](https://github.com/emberjs/ember.js/pull/12728) [BUGFIX] Fix incorrect export for `Ember.computed.collect`.
- [#12731](https://github.com/emberjs/ember.js/pull/12731) [BUGFIX] Ensure `container` can still be provided to `.create` (prevents an error and provides a helpful deprecation).
-
-### v2.3.0-beta.2 (November 29, 2015)
-
- [#12626](https://github.com/emberjs/ember.js/pull/12626) [BUGFIX] Fix "rest" style positional params in contextual components when using dot syntax.
- [#12627](https://github.com/emberjs/ember.js/pull/12627) [CLEANUP] Remove unused `ENV` flags.
* `Ember.ENV.ENABLE_ALL_FEATURES` is removed (wasn't functionally different than `Ember.ENV.ENABLE_OPTIONAL_FEATURES`).
@@ -23,9 +74,6 @@
- [#12628](https://github.com/emberjs/ember.js/pull/12628) [BUGFIX] Fix processing arguments in rerender for contextual components.
- [#12629](https://github.com/emberjs/ember.js/pull/12629) [BUGFIX] Expose `ownerInjection` method on `ContainerProxy`.
- [#12636](https://github.com/emberjs/ember.js/pull/12636) [BUGFIX] Ensure `Ember.Mixin.prototype.toString` is defined (prevents issues with `Object.seal(Ember.Mixin.prototype)` in debug builds.
-
-### v2.3.0-beta.1 (November 16, 2015)
-
- [#12532](https://github.com/emberjs/ember.js/pull/12532) Bump RSVP dependency from 3.0.6 to 3.1.0.
- [#12422](https://github.com/emberjs/ember.js/pull/12422) / [#12495](https://github.com/emberjs/ember.js/pull/12495) / [#12517](https://github.com/emberjs/ember.js/pull/12517) / [#12561](https://github.com/emberjs/ember.js/pull/12561) / [#12542](https://github.com/emberjs/ember.js/pull/12542) / [#12570](https://github.com/emberjs/ember.js/pull/12570) [FEATURE ember-contextual-components]
- [#11874](https://github.com/emberjs/ember.js/pull/11874) / [#12562](https://github.com/emberjs/ember.js/pull/12562) / [#12557](https://github.com/emberjs/ember.js/pull/12557) / [#12578](https://github.com/emberjs/ember.js/pull/12578) / [#12599](https://github.com/emberjs/ember.js/pull/12599) / [#12570](https://github.com/emberjs/ember.js/pull/12570) / [#12604](https://github.com/emberjs/ember.js/pull/12604) / [#12609](https://github.com/emberjs/ember.js/pull/12609) [FEATURE ember-container-inject-owner] | false |
Other | emberjs | ember.js | 8364cde050c44b47e24d3ebae23a51f6696f656c.json | Fix stupid rule errors.
GGRRRRRR!!!!!! | packages/ember-metal/lib/index.js | @@ -370,14 +370,12 @@ if (has('ember-debug')) {
deprecate(
'Support for the `ember-legacy-views` addon will end soon, please remove it from your application.',
!!Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT,
- { id: 'ember-legacy-views', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_ember-view' }
-);
+ { id: 'ember-legacy-views', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_ember-view' });
deprecate(
'Support for the `ember-legacy-controllers` addon will end soon, please remove it from your application.',
!!Ember.ENV._ENABLE_LEGACY_CONTROLLER_SUPPORT,
- { id: 'ember-legacy-controllers', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_objectcontroller' }
-);
+ { id: 'ember-legacy-controllers', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_objectcontroller' });
Ember.create = deprecateFunc('Ember.create is deprecated in favor of Object.create', { id: 'ember-metal.ember-create', until: '3.0.0' }, Object.create);
Ember.keys = deprecateFunc('Ember.keys is deprecated in favor of Object.keys', { id: 'ember-metal.ember.keys', until: '3.0.0' }, Object.keys); | false |
Other | emberjs | ember.js | 5c8018004a3a756f4a0f69a5347747c0a61f5759.json | Add deprecation for legacy addons | packages/ember-metal/lib/index.js | @@ -6,7 +6,7 @@
// BEGIN IMPORTS
import require, { has } from 'require';
import Ember from 'ember-metal/core';
-import { deprecateFunc } from 'ember-metal/debug';
+import { deprecate, deprecateFunc } from 'ember-metal/debug';
import isEnabled, { FEATURES } from 'ember-metal/features';
import assign from 'ember-metal/assign';
import merge from 'ember-metal/merge';
@@ -367,6 +367,18 @@ if (has('ember-debug')) {
}
}
+deprecate(
+ 'Support for the `ember-legacy-views` addon will end soon, please remove it from your application.',
+ !!Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT,
+ { id: 'ember-legacy-views', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_ember-view' }
+);
+
+deprecate(
+ 'Support for the `ember-legacy-controllers` addon will end soon, please remove it from your application.',
+ !!Ember.ENV._ENABLE_LEGACY_CONTROLLER_SUPPORT,
+ { id: 'ember-legacy-controllers', until: '2.6.0', url: 'http://emberjs.com/deprecations/v1.x/#toc_objectcontroller' }
+);
+
Ember.create = deprecateFunc('Ember.create is deprecated in favor of Object.create', { id: 'ember-metal.ember-create', until: '3.0.0' }, Object.create);
Ember.keys = deprecateFunc('Ember.keys is deprecated in favor of Object.keys', { id: 'ember-metal.ember.keys', until: '3.0.0' }, Object.keys);
| false |
Other | emberjs | ember.js | a3e0d93b867c2b733c83f98b92be9daa8a511ec1.json | Implement Glimmer Teardown | package.json | @@ -33,7 +33,7 @@
"express": "^4.5.0",
"finalhandler": "^0.4.0",
"github": "^0.2.3",
- "glimmer-engine": "tildeio/glimmer#71a683d",
+ "glimmer-engine": "tildeio/glimmer#4c2b632",
"glob": "~4.3.2",
"htmlbars": "0.14.14",
"qunit-extras": "^1.4.0", | true |
Other | emberjs | ember.js | a3e0d93b867c2b733c83f98b92be9daa8a511ec1.json | Implement Glimmer Teardown | packages/ember-glimmer/lib/components/curly-component.js | @@ -37,14 +37,14 @@ class CurlyComponentManager {
didCreateElement(component, element) {
component.element = element;
- // component._transitionTo('hasElement');
+ component._transitionTo('hasElement');
}
didCreate(component) {
// component.didInsertElement();
// component.didRender();
- // component._transitionTo('inDOM');
+ component._transitionTo('inDOM');
}
update(component, args, keywords) {
@@ -63,6 +63,10 @@ class CurlyComponentManager {
// component.didUpdate();
// component.didRender();
}
+
+ getDestructor(component) {
+ return component;
+ }
}
const MANAGER = new CurlyComponentManager(); | true |
Other | emberjs | ember.js | a3e0d93b867c2b733c83f98b92be9daa8a511ec1.json | Implement Glimmer Teardown | packages/ember-glimmer/lib/ember-metal-views/index.js | @@ -28,6 +28,7 @@ export class Renderer {
remove(view) {
view._transitionTo('destroying');
+ view['_renderResult'].destroy();
view.destroy();
}
| true |
Other | emberjs | ember.js | a3e0d93b867c2b733c83f98b92be9daa8a511ec1.json | Implement Glimmer Teardown | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -1,5 +1,6 @@
import { set } from 'ember-metal/property_set';
import Component from 'ember-views/components/component';
+import { strip } from '../../utils/abstract-test-case';
import { moduleFor, RenderingTest } from '../../utils/test-case';
moduleFor('Components test: curly components', class extends RenderingTest {
@@ -198,4 +199,76 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { content: 'hello' });
}
+ ['@test the component and its child components are destroyed'](assert) {
+ let destroyed = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0 };
+
+ this.registerComponent('foo-bar', {
+ template: '{{id}} {{yield}}',
+ ComponentClass: Component.extend({
+ willDestroy() {
+ this._super();
+ destroyed[this.get('id')]++;
+ }
+ })
+ });
+
+ this.render(strip(`
+ {{#if cond1}}
+ {{#foo-bar id=1}}
+ {{#if cond2}}
+ {{#foo-bar id=2}}{{/foo-bar}}
+ {{#if cond3}}
+ {{#foo-bar id=3}}
+ {{#if cond4}}
+ {{#foo-bar id=4}}
+ {{#if cond5}}
+ {{#foo-bar id=5}}{{/foo-bar}}
+ {{#foo-bar id=6}}{{/foo-bar}}
+ {{#foo-bar id=7}}{{/foo-bar}}
+ {{/if}}
+ {{#foo-bar id=8}}{{/foo-bar}}
+ {{/foo-bar}}
+ {{/if}}
+ {{/foo-bar}}
+ {{/if}}
+ {{/if}}
+ {{/foo-bar}}
+ {{/if}}`),
+ {
+ cond1: true,
+ cond2: true,
+ cond3: true,
+ cond4: true,
+ cond5: true
+ }
+ );
+
+ this.assertText('1 2 3 4 5 6 7 8 ');
+
+ this.runTask(() => this.rerender());
+
+ assert.deepEqual(destroyed, { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0 });
+
+ this.runTask(() => set(this.context, 'cond5', false));
+
+ this.assertText('1 2 3 4 8 ');
+
+ assert.deepEqual(destroyed, { 1: 0, 2: 0, 3: 0, 4: 0, 5: 1, 6: 1, 7: 1, 8: 0 });
+
+ this.runTask(() => {
+ set(this.context, 'cond3', false);
+ set(this.context, 'cond5', true);
+ set(this.context, 'cond4', false);
+ });
+
+ assert.deepEqual(destroyed, { 1: 0, 2: 0, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 1 });
+
+ this.runTask(() => {
+ set(this.context, 'cond2', false);
+ set(this.context, 'cond1', false);
+ });
+
+ assert.deepEqual(destroyed, { 1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 1 });
+ }
+
}); | true |
Other | emberjs | ember.js | a3e0d93b867c2b733c83f98b92be9daa8a511ec1.json | Implement Glimmer Teardown | packages/ember-glimmer/tests/utils/abstract-test-case.js | @@ -229,3 +229,7 @@ export class RenderingTest extends TestCase {
}
}
}
+
+export function strip(str) {
+ return str.split('\n').map(s => s.trim()).join('');
+} | true |
Other | emberjs | ember.js | 5fa2a238b69e6067d3a43ca576ea268be22be4fd.json | Run the basic tests for each helper configuration | packages/ember-glimmer/tests/integration/helpers/inline-if-test.js | @@ -65,7 +65,7 @@ moduleFor('@glimmer Helpers test: {{if}} used with another helper', class extend
return `(if ${cond} ${truthy} ${falsy})`;
}
-});
+}, BASIC_TRUTHY_TESTS, BASIC_FALSY_TESTS);
moduleFor('@glimmer Helpers test: {{if}} used in attribute position', class extends SharedHelperConditionalsTest {
@@ -81,4 +81,4 @@ moduleFor('@glimmer Helpers test: {{if}} used in attribute position', class exte
return this.$('div').attr('data-foo');
}
-});
+}, BASIC_TRUTHY_TESTS, BASIC_FALSY_TESTS); | false |
Other | emberjs | ember.js | f9b99cdc0cacbeb6d6105cdc9ff0af9395bcf873.json | Add a util function for toString'ing objects | packages/ember-metal/lib/utils.js | @@ -382,7 +382,7 @@ export function tryInvoke(obj, methodName, args) {
// TYPING & ARRAY MESSAGING
//
-var toString = Object.prototype.toString;
+var objectToString = Object.prototype.toString;
/**
Forces the passed object to be part of an array. If the object is already
@@ -442,7 +442,7 @@ export function inspect(obj) {
return '' + obj;
}
// overridden toString
- if (typeof obj.toString === 'function' && obj.toString !== toString) {
+ if (typeof obj.toString === 'function' && obj.toString !== objectToString) {
return obj.toString();
}
@@ -456,7 +456,7 @@ export function inspect(obj) {
if (typeof v === 'function') { v = 'function() { ... }'; }
if (v && typeof v.toString !== 'function') {
- ret.push(key + ': ' + toString.call(v));
+ ret.push(key + ': ' + objectToString.call(v));
} else {
ret.push(key + ': ' + v);
}
@@ -520,6 +520,16 @@ export function lookupDescriptor(obj, keyName) {
return null;
}
+// A `toString` util function that supports objects without a `toString`
+// method, e.g. an object created with `Object.create(null)`.
+export function toString(obj) {
+ if (obj && obj.toString) {
+ return obj.toString();
+ } else {
+ return objectToString.call(obj);
+ }
+}
+
export {
GUID_KEY,
makeArray, | true |
Other | emberjs | ember.js | f9b99cdc0cacbeb6d6105cdc9ff0af9395bcf873.json | Add a util function for toString'ing objects | packages/ember-metal/tests/utils_test.js | @@ -1,5 +1,9 @@
-import { inspect, checkHasSuper } from 'ember-metal/utils';
import environment from 'ember-metal/environment';
+import {
+ inspect,
+ checkHasSuper,
+ toString
+} from 'ember-metal/utils';
QUnit.module('Ember Metal Utils');
@@ -24,3 +28,20 @@ if (environment.isPhantom || environment.isChrome || environment.isFirefox) {
assert.notOk(checkHasSuper(function() {}), 'empty function does not have super');
});
}
+
+QUnit.test("toString uses an object's toString method when available", function() {
+ let obj = {
+ toString() {
+ return "bob";
+ }
+ };
+
+ strictEqual(toString(obj), 'bob');
+});
+
+
+QUnit.test("toString falls back to Object.prototype.toString", function() {
+ let obj = Object.create(null);
+
+ strictEqual(toString(obj), {}.toString());
+}); | true |
Other | emberjs | ember.js | bfe959e72879f38adde992a3e46ea4cd6fabef3d.json | publish dist bower.json & co to s3 | config/s3ProjectConfig.js | @@ -9,48 +9,52 @@ function fileMap(revision,tag,date) {
"ember.min.js": fileObject("ember.min", ".js", "text/javascript", revision, tag, date),
"ember.prod.js": fileObject("ember.prod", ".js", "text/javascript", revision, tag, date),
"../docs/data.json": fileObject("ember-docs", ".json", "application/json", revision, tag, date),
- "ember-tests/index.html": fileObject("ember-tests-index", ".html", "text/html", revision, tag, date)
+ "ember-tests/index.html": fileObject("ember-tests-index", ".json", "application/json", revision, tag, date),
+ "bower.json": fileObject("bower", ".json", "application/json", revision, tag, date),
+ "component.json": fileObject("component", ".json", "application/json", revision, tag, date),
+ "composer.json": fileObject("composer", ".json", "application/json", revision, tag, date),
+ "package.json": fileObject("package", ".json", "application/json", revision, tag, date),
};
};
function fileObject(baseName, extension, contentType, currentRevision, tag, date) {
var fullName = "/" + baseName + extension;
var obj = {
contentType: contentType,
- destinations: {
- canary: [
- "latest" + fullName,
- "canary" + fullName,
- "canary/daily/" + date + fullName,
- "canary/shas/" + currentRevision + fullName
- ],
- release: [
- "stable" + fullName,
- "release" + fullName,
- "release/daily/" + date + fullName,
- "release/shas/" + currentRevision + fullName
- ],
- 'release-1-13': [
- "release-1-13" + fullName,
- "release-1-13/daily/" + date + fullName,
- "release-1-13/shas/" + currentRevision + fullName
- ],
- beta: [
- "beta" + fullName,
- "beta/daily/" + date + fullName,
- "beta/shas/" + currentRevision + fullName
- ],
- wildcard: []
- }
- };
+ destinations: {
+ canary: [
+ "latest" + fullName,
+ "canary" + fullName,
+ "canary/daily/" + date + fullName,
+ "canary/shas/" + currentRevision + fullName
+ ],
+ release: [
+ "stable" + fullName,
+ "release" + fullName,
+ "release/daily/" + date + fullName,
+ "release/shas/" + currentRevision + fullName
+ ],
+ 'release-1-13': [
+ "release-1-13" + fullName,
+ "release-1-13/daily/" + date + fullName,
+ "release-1-13/shas/" + currentRevision + fullName
+ ],
+ beta: [
+ "beta" + fullName,
+ "beta/daily/" + date + fullName,
+ "beta/shas/" + currentRevision + fullName
+ ],
+ wildcard: []
+ }
+ };
- if (tag) {
- for (var key in obj.destinations) {
- obj.destinations[key].push("tags/" + tag + fullName);
- }
- }
+ if (tag) {
+ for (var key in obj.destinations) {
+ obj.destinations[key].push("tags/" + tag + fullName);
+ }
+ }
- return obj;
+ return obj;
}
module.exports = fileMap; | false |
Other | emberjs | ember.js | edbf2dd34672be90b95087c0fac7871919001490.json | update jquery dependency | bower.json | @@ -5,7 +5,7 @@
"url": "https://github.com/emberjs/ember.js.git"
},
"dependencies": {
- "jquery": "~1.11.1",
+ "jquery": ">=1.11.1 <3.0.0",
"qunit": "~1.20.0",
"qunit-phantom-runner": "jonkemp/qunit-phantomjs-runner#1.2.0"
}, | true |
Other | emberjs | ember.js | edbf2dd34672be90b95087c0fac7871919001490.json | update jquery dependency | config/package_manager_files/bower.json | @@ -12,6 +12,6 @@
"url": "https://github.com/emberjs/ember.js.git"
},
"dependencies": {
- "jquery": ">= 1.7.0 < 2.2.0"
+ "jquery": ">= 1.7.0 < 3.0.0"
}
} | true |
Other | emberjs | ember.js | edbf2dd34672be90b95087c0fac7871919001490.json | update jquery dependency | config/package_manager_files/component.json | @@ -9,6 +9,6 @@
"ember.debug.js"
],
"dependencies": {
- "components/jquery": ">= 1.7.0 < 2.2.0"
+ "components/jquery": ">= 1.7.0 < 3.0.0"
}
} | true |
Other | emberjs | ember.js | edbf2dd34672be90b95087c0fac7871919001490.json | update jquery dependency | config/package_manager_files/composer.json | @@ -5,7 +5,7 @@
"license": "MIT",
"homepage": "https://github.com/emberjs/ember.js",
"require": {
- "components/jquery": ">=1.7.0, < 2.2.0"
+ "components/jquery": ">=1.7.0, < 3.0.0"
},
"extra": {
"component": { | true |
Other | emberjs | ember.js | edbf2dd34672be90b95087c0fac7871919001490.json | update jquery dependency | config/package_manager_files/package.json | @@ -9,7 +9,7 @@
],
"main": "./ember.debug.js",
"dependencies": {
- "jquery": ">=1.7.0 < 2.2.0"
+ "jquery": ">=1.7.0 <3.0.0"
},
"jspm": {
"main": "ember.debug", | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/components/curly-component.js | @@ -0,0 +1,85 @@
+import { StatementSyntax } from 'glimmer-runtime';
+
+export class CurlyComponentSyntax extends StatementSyntax {
+ constructor(options) {
+ super();
+ this.options = options;
+ }
+
+ compile(builder) {
+ builder.openComponent(this.options);
+ builder.closeComponent();
+ }
+}
+
+import assign from 'ember-metal/assign';
+
+class CurlyComponentManager {
+ create(definition, args) {
+ let klass = definition.ComponentClass;
+ let attrs = args.value();
+ let merged = assign({}, attrs, { attrs });
+ let component = klass.create(merged);
+
+ // component.didInitAttrs({ attrs });
+ // component.didReceiveAttrs({ oldAttrs: null, newAttrs: attrs });
+ // component.willInsertElement();
+ // component.willRender();
+
+ return component;
+ }
+
+ didCreate(component) {
+ // component.didInsertElement();
+ // component.didRender();
+ }
+
+ update(component, args) {
+ // let oldAttrs = component.attrs;
+ let newAttrs = args.value();
+ let merged = assign({}, newAttrs, { attrs: newAttrs });
+
+ component.setProperties(merged);
+ // component.didUpdateAttrs({ oldAttrs, newAttrs });
+ // component.didReceiveAttrs({ oldAttrs, newAttrs });
+ // component.willUpdate();
+ // component.willRender();
+ }
+
+ didUpdate(component) {
+ // component.didUpdate();
+ // component.didRender();
+ }
+
+ getSelf(component) {
+ return component;
+ }
+}
+
+const MANAGER = new CurlyComponentManager();
+
+import { ComponentDefinition, ValueReference } from 'glimmer-runtime';
+import Component from 'ember-views/components/component';
+
+function elementId(vm) {
+ let component = vm.getSelf().value();
+ return new ValueReference(component.elementId);
+}
+
+export class CurlyComponentDefinition extends ComponentDefinition {
+ constructor(name, ComponentClass, template) {
+ super(name, MANAGER, ComponentClass || Component);
+ this.template = template;
+ }
+
+ getLayout() {
+ return this.template.asLayout();
+ }
+
+ compile(builder) {
+ builder.tag('div');
+ builder.attrs.dynamic({ name: 'id', value: elementId });
+ builder.attrs.static({ name: 'class', value: 'ember-view' });
+ builder.body.fromLayout(this.getLayout());
+ }
+} | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/ember-metal-views/index.js | @@ -11,7 +11,7 @@ export class Renderer {
let self = new RootReference(view);
env.begin();
- let result = view.template.render(self, env, { appendTo: target });
+ let result = view.template.asEntryPoint().render(self, env, { appendTo: target });
env.commit();
// FIXME: Store this somewhere else | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/ember-template-compiler/system/compile.js | @@ -2,21 +2,15 @@ import template from './template';
import require, { has } from 'require';
let compileSpec;
-let Template;
export default function compile(string, options) {
if (!compileSpec && has('glimmer-compiler')) {
compileSpec = require('glimmer-compiler').compileSpec;
}
- if (!Template && has('glimmer-runtime')) {
- Template = require('glimmer-runtime').Template;
- }
-
- if (!compileSpec || !Template) {
+ if (!compileSpec) {
throw new Error('Cannot call `compile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `compile`.');
}
- let templateSpec = template(compileSpec(string, options));
- return Template.fromSpec(templateSpec, options.env);
+ return template(compileSpec(string, options));
} | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/ember-template-compiler/system/template.js | @@ -1,3 +1,29 @@
-export default function template(templateSpec) {
- return JSON.parse(templateSpec);
+import EmberObject from 'ember-runtime/system/object';
+import { Template } from 'glimmer-runtime';
+
+const Wrapper = EmberObject.extend({
+ _entryPoint: null,
+ _layout: null,
+
+ asEntryPoint() {
+ if (!this._entryPoint) {
+ let { spec, env } = this;
+ this._entryPoint = Template.fromSpec(spec, env);
+ }
+
+ return this._entryPoint;
+ },
+
+ asLayout() {
+ if (!this._layout) {
+ let { spec, env } = this;
+ this._layout = Template.layoutFromSpec(spec, env);
+ }
+
+ return this._layout;
+ }
+});
+
+export default function template(json) {
+ return Wrapper.extend({ spec: JSON.parse(json) });
} | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/environment.js | @@ -1,6 +1,9 @@
import { Environment, ConditionalReference } from 'glimmer-runtime';
import { get } from 'ember-metal/property_get';
+import Dict from 'ember-metal/empty_object';
import { toBool as emberToBool } from './helpers/if-unless';
+import { CurlyComponentSyntax, CurlyComponentDefinition } from './components/curly-component';
+import lookupComponent from './utils/lookup-component';
// @implements PathReference
export class RootReference {
@@ -63,12 +66,49 @@ export default class extends Environment {
constructor({ dom, owner }) {
super(dom);
this.owner = owner;
+ this._components = new Dict();
+ }
+
+ refineStatement(statement) {
+ let {
+ isSimple,
+ isInline,
+ isBlock,
+ key,
+ path,
+ args,
+ templates
+ } = statement;
+
+ if (isSimple && (isInline || isBlock) && key.indexOf('-') >= 0) {
+ let definition = this.getComponentDefinition(path);
+
+ if (definition) {
+ return new CurlyComponentSyntax({ args, definition, templates });
+ }
+ }
+
+ return super.refineStatement(statement);
}
hasComponentDefinition() {
return false;
}
+ getComponentDefinition(name) {
+ let definition = this._components[name];
+
+ if (!definition) {
+ let { component: ComponentClass, layout } = lookupComponent(this.owner, name[0]);
+
+ if (ComponentClass || layout) {
+ definition = this._components[name] = new CurlyComponentDefinition(name, ComponentClass, layout);
+ }
+ }
+
+ return definition;
+ }
+
hasHelper(name) {
if (typeof helpers[name[0]] === 'function') {
return true; | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/lib/utils/lookup-component.js | @@ -0,0 +1,26 @@
+import isEnabled from 'ember-metal/features';
+
+function lookupComponentPair(componentLookup, owner, name, options) {
+ return {
+ component: componentLookup.componentFor(name, owner, options),
+ layout: componentLookup.layoutFor(name, owner, options)
+ };
+}
+
+export default function lookupComponent(owner, name, options) {
+ let componentLookup = owner.lookup('component-lookup:main');
+
+ if (isEnabled('ember-htmlbars-local-lookup')) {
+ let source = options && options.source;
+
+ if (source) {
+ let localResult = lookupComponentPair(componentLookup, owner, name, options);
+
+ if (localResult.component || localResult.layout) {
+ return localResult;
+ }
+ }
+ }
+
+ return lookupComponentPair(componentLookup, owner, name);
+} | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -0,0 +1,17 @@
+import { moduleFor, RenderingTest } from '../../utils/test-case';
+
+moduleFor('Components test: curly components', class extends RenderingTest {
+
+ ['@test it can render a basic component']() {
+ this.registerComponent('foo-bar', { template: 'hello' });
+
+ this.render(`{{foo-bar}}`);
+
+ this.assertComponentElement(this.firstChild, { content: 'hello' });
+
+ this.runTask(() => this.rerender());
+
+ this.assertComponentElement(this.firstChild, { content: 'hello' });
+ }
+
+}); | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/tests/utils/abstract-test-case.js | @@ -1,15 +1,14 @@
import packageName from './package-name';
import Environment from './environment';
import { compile, helper, Helper, DOMHelper, Renderer } from './helpers';
-import { equalTokens } from 'glimmer-test-helpers';
+import { equalsElement, equalTokens, regex, classes } from 'glimmer-test-helpers';
import run from 'ember-metal/run_loop';
import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
import Component from 'ember-views/components/component';
import jQuery from 'ember-views/system/jquery';
import assign from 'ember-metal/assign';
import { OWNER } from 'container/owner';
import buildOwner from 'container/tests/test-helpers/build-owner';
-import ComponentLookup from 'ember-views/component_lookup';
const packageTag = `@${packageName} `;
@@ -82,10 +81,6 @@ export class RenderingTest extends TestCase {
this.element = jQuery('#qunit-fixture')[0];
this.component = null;
this.snapshot = null;
-
- owner.register('component-lookup:main', ComponentLookup);
- owner.registerOptionsForType('helper', { instantiate: false });
- owner.registerOptionsForType('component', { singleton: false });
}
teardown() {
@@ -126,13 +121,15 @@ export class RenderingTest extends TestCase {
}
render(templateStr, context = {}) {
- let { env, renderer, owner } = this;
+ let { renderer, owner } = this;
+
+ owner.register('template:-top-level', compile(templateStr));
let attrs = assign({}, context, {
tagName: '',
[OWNER]: owner,
renderer,
- template: compile(templateStr, { env })
+ template: owner.lookup('template:-top-level')
});
this.component = Component.create(attrs);
@@ -160,7 +157,7 @@ export class RenderingTest extends TestCase {
}
}
- registerComponent(name, { ComponentClass, template }) {
+ registerComponent(name, { ComponentClass = null, template = null }) {
let { owner, env } = this;
if (ComponentClass) {
@@ -188,12 +185,17 @@ export class RenderingTest extends TestCase {
assert.strictEqual(node.textContent, text, 'node.textContent');
}
- assertElement(node, { ElementType = HTMLElement, tagName }) {
+ assertElement(node, { ElementType = HTMLElement, tagName, attrs = null, content = null }) {
if (!(node instanceof ElementType)) {
throw new Error(`Expecting a ${ElementType.name}, but got ${node}`);
}
- assert.strictEqual(node.tagName, tagName.toUpperCase(), 'node.tagName');
+ equalsElement(node, tagName, attrs, content);
+ }
+
+ assertComponentElement(node, { ElementType = HTMLElement, tagName = 'div', attrs = null, content = null }) {
+ attrs = assign({}, { id: regex(/^ember\d*$/), class: classes('ember-view') }, attrs || {});
+ this.assertElement(node, { ElementType, tagName, attrs, content });
}
assertSameNode(node1, node2) { | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-glimmer/tests/utils/test-case.js | @@ -1,7 +1,20 @@
export { TestCase, moduleFor } from './abstract-test-case';
import { RenderingTest as AbstractRenderingTest } from './abstract-test-case';
+import ComponentLookup from 'ember-views/component_lookup';
export class RenderingTest extends AbstractRenderingTest {
+ constructor() {
+ super();
+
+ let { owner } = this;
+
+ owner.register('component-lookup:main', ComponentLookup);
+ owner.register('service:-glimmer-env', this.env, { instantiate: false });
+ owner.inject('template', 'env', 'service:-glimmer-env');
+ owner.registerOptionsForType('helper', { instantiate: false });
+ owner.registerOptionsForType('component', { singleton: false });
+ }
+
runTask(callback) {
super.runTask(() => {
callback(); | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-htmlbars/lib/utils/lookup-component.js | @@ -1,26 +1,26 @@
import isEnabled from 'ember-metal/features';
-function lookupComponentPair(componentLookup, owner, tagName, options) {
+function lookupComponentPair(componentLookup, owner, name, options) {
return {
- component: componentLookup.componentFor(tagName, owner, options),
- layout: componentLookup.layoutFor(tagName, owner, options)
+ component: componentLookup.componentFor(name, owner, options),
+ layout: componentLookup.layoutFor(name, owner, options)
};
}
-export default function lookupComponent(owner, tagName, options) {
+export default function lookupComponent(owner, name, options) {
let componentLookup = owner.lookup('component-lookup:main');
if (isEnabled('ember-htmlbars-local-lookup')) {
let source = options && options.source;
if (source) {
- let localResult = lookupComponentPair(componentLookup, owner, tagName, options);
+ let localResult = lookupComponentPair(componentLookup, owner, name, options);
if (localResult.component || localResult.layout) {
return localResult;
}
}
}
- return lookupComponentPair(componentLookup, owner, tagName);
+ return lookupComponentPair(componentLookup, owner, name);
} | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-htmlbars/tests/integration/components | @@ -0,0 +1 @@
+../../../ember-glimmer/tests/integration/components
\ No newline at end of file | true |
Other | emberjs | ember.js | 1f4b0a19c02f19caff5ddc59f287ee2d66f50dc1.json | Implement basic support for components in Glimmer | packages/ember-htmlbars/tests/utils/test-case.js | @@ -1 +1,16 @@
-export * from './abstract-test-case';
+export { TestCase, moduleFor } from './abstract-test-case';
+import { RenderingTest as AbstractRenderingTest } from './abstract-test-case';
+import ComponentLookup from 'ember-views/component_lookup';
+
+export class RenderingTest extends AbstractRenderingTest {
+ constructor() {
+ super();
+
+ let { owner } = this;
+
+ owner.register('component-lookup:main', ComponentLookup);
+ owner.registerOptionsForType('helper', { instantiate: false });
+ owner.registerOptionsForType('template', { instantiate: false });
+ owner.registerOptionsForType('component', { singleton: false });
+ }
+} | true |
Other | emberjs | ember.js | f5377739b4d59fc3b522756ca73f37e6c1e6c004.json | Add unit test for `objectAt` | packages/ember-runtime/tests/mixins/array_test.js | @@ -390,6 +390,11 @@ QUnit.test('modifying the array should also indicate the isDone prop itself has
equal(count, 1, '@each.isDone should have notified');
});
+QUnit.test('`objectAt` returns correct object', function() {
+ let arr = ['first', 'second', 'third', 'fourth'];
+ equal(objectAt(arr, 2), 'third');
+ equal(objectAt(arr, 4), undefined);
+});
testBoth('should be clear caches for computed properties that have dependent keys on arrays that are changed after object initialization', function(get, set) {
var obj = EmberObject.extend({ | false |
Other | emberjs | ember.js | d56f929aa0b76f96d5a48c3dc2427041ba943b0f.json | Expose router.transitionTo as a public method | packages/ember-routing/lib/system/router.js | @@ -321,7 +321,7 @@ var EmberRouter = EmberObject.extend(Evented, {
containing a mapping of query parameters
@return {Transition} the transition object associated with this
attempted transition
- @private
+ @public
*/
transitionTo(...args) {
var queryParams; | false |
Other | emberjs | ember.js | 88513912bef6c9c7b26e6d80ca81feff2c488e05.json | Return the tests object | packages/ember-glimmer/tests/utils/shared-conditional-tests.js | @@ -146,6 +146,8 @@ export const BASIC_FALSY_TESTS = {
this.assertText('T1');
};
}
+
+ return tests;
}
}; | false |
Other | emberjs | ember.js | 25cc24018b02c9fd826ea52a84acc3a3b5910a4c.json | Test no-op rerender | packages/ember-glimmer/tests/integration/helpers/concat-test.js | @@ -16,6 +16,10 @@ moduleFor('Helpers test: {{concat}}', class extends RenderingTest {
this.assertText('onetwo');
+ this.inZone(() => this.rerender());
+
+ this.assertText('onetwo');
+
this.inZone(() => set(this.context, 'first', 'three'));
this.assertText('threetwo');
@@ -35,6 +39,10 @@ moduleFor('Helpers test: {{concat}}', class extends RenderingTest {
this.assertText('onetwothreefour');
+ this.inZone(() => this.rerender());
+
+ this.assertText('onetwothreefour');
+
this.inZone(() => {
set(this.context, 'first', 'five');
set(this.context, 'third', 'six');
@@ -53,6 +61,10 @@ moduleFor('Helpers test: {{concat}}', class extends RenderingTest {
this.assertText('Truthy!');
+ this.inZone(() => this.rerender());
+
+ this.assertText('Truthy!');
+
this.inZone(() => set(this.context, 'first', 'three'));
this.assertText('False'); | false |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-glimmer/tests/utils/test-case.js | @@ -40,11 +40,24 @@ let assert = QUnit.assert;
const TextNode = window.Text;
const HTMLElement = window.HTMLElement;
+const Comment = window.Comment;
export class TestCase {
teardown() {}
}
+function isMarker(node) {
+ if (node instanceof Comment && node.textContent === '') {
+ return true;
+ }
+
+ if (node instanceof TextNode && node.textContent === '') {
+ return true;
+ }
+
+ return false;
+}
+
export class RenderingTest extends TestCase {
constructor() {
super();
@@ -67,13 +80,20 @@ export class RenderingTest extends TestCase {
}
get firstChild() {
- return this.element.firstChild;
+ let node = this.element.firstChild;
+
+ while (node && isMarker(node)) {
+ node = node.nextSibling;
+ }
+
+ return node;
}
render(templateStr, context = {}) {
let { env, renderer, owner } = this;
let attrs = assign({}, context, {
+ tagName: '',
[OWNER]: owner,
renderer,
template: compile(templateStr, { env }) | true |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-htmlbars/tests/integration/content-test.js | @@ -0,0 +1 @@
+../../../ember-glimmer/tests/integration/content-test.js
\ No newline at end of file | true |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-htmlbars/tests/utils/environment.js | @@ -0,0 +1,2 @@
+export default class Environment {
+} | true |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-htmlbars/tests/utils/helpers.js | @@ -0,0 +1,3 @@
+export { default as DOMHelper } from 'ember-htmlbars/system/dom-helper';
+export { Renderer } from 'ember-metal-views';
+export { default as compile } from 'ember-template-compiler/system/compile'; | true |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-htmlbars/tests/utils/package-name.js | @@ -0,0 +1 @@
+export default 'htmlbars'; | true |
Other | emberjs | ember.js | dd38edea81ae142946eb1290f5495334bf7bd59b.json | Run the new integration tests in HTMLBars
`content-test` now passes in both `ember-htmlbars` and `ember-glimmer`. | packages/ember-htmlbars/tests/utils/test-case.js | @@ -0,0 +1 @@
+../../../ember-glimmer/tests/utils/test-case.js
\ No newline at end of file | true |
Other | emberjs | ember.js | 7a74435c93726ba411eb3031b10ecf57c2693b23.json | Add a failing test for #12475 | packages/ember-metal/lib/watching.js | @@ -53,6 +53,11 @@ export function isWatching(obj, key) {
return (meta && meta.peekWatching(key)) > 0;
}
+export function watcherCount(obj, key) {
+ var meta = peekMeta(obj);
+ return (meta && meta.peekWatching(key)) || 0;
+}
+
watch.flushPending = flushPendingChains;
export function unwatch(obj, _keyPath, m) { | true |
Other | emberjs | ember.js | 7a74435c93726ba411eb3031b10ecf57c2693b23.json | Add a failing test for #12475 | packages/ember-runtime/tests/system/array_proxy/watching_and_listening_test.js | @@ -0,0 +1,155 @@
+import { get } from 'ember-metal/property_get';
+import { listenersFor } from 'ember-metal/events';
+import { addObserver } from 'ember-metal/observer';
+import { defineProperty } from 'ember-metal/properties';
+import { watcherCount } from 'ember-metal/watching';
+import computed from 'ember-metal/computed';
+import ArrayProxy from 'ember-runtime/system/array_proxy';
+import { A } from 'ember-runtime/system/native_array';
+
+function sortedListenersFor(obj, eventName) {
+ return listenersFor(obj, eventName).sort((listener1, listener2) => {
+ return (listener1[1] > listener2[1]) ? -1 : 1;
+ });
+}
+
+QUnit.module('ArrayProxy - watching and listening');
+
+QUnit.test(`setting 'content' adds listeners correctly`, function() {
+ let content = A();
+ let proxy = ArrayProxy.create();
+
+ deepEqual(sortedListenersFor(content, '@array:before'), []);
+ deepEqual(sortedListenersFor(content, '@array:change'), []);
+
+ proxy.set('content', content);
+
+ deepEqual(
+ sortedListenersFor(content, '@array:before'),
+ [[proxy, 'contentArrayWillChange'], [proxy, 'arrangedContentArrayWillChange']]
+ );
+ deepEqual(
+ sortedListenersFor(content, '@array:change'),
+ [[proxy, 'contentArrayDidChange'], [proxy, 'arrangedContentArrayDidChange']]
+ );
+});
+
+QUnit.test(`changing 'content' adds and removes listeners correctly`, function() {
+ let content1 = A();
+ let content2 = A();
+ let proxy = ArrayProxy.create({ content: content1 });
+
+ deepEqual(
+ sortedListenersFor(content1, '@array:before'),
+ [[proxy, 'contentArrayWillChange'], [proxy, 'arrangedContentArrayWillChange']]
+ );
+ deepEqual(
+ sortedListenersFor(content1, '@array:change'),
+ [[proxy, 'contentArrayDidChange'], [proxy, 'arrangedContentArrayDidChange']]
+ );
+
+ proxy.set('content', content2);
+
+ deepEqual(sortedListenersFor(content1, '@array:before'), []);
+ deepEqual(sortedListenersFor(content1, '@array:change'), []);
+ deepEqual(
+ sortedListenersFor(content2, '@array:before'),
+ [[proxy, 'contentArrayWillChange'], [proxy, 'arrangedContentArrayWillChange']]
+ );
+ deepEqual(
+ sortedListenersFor(content2, '@array:change'),
+ [[proxy, 'contentArrayDidChange'], [proxy, 'arrangedContentArrayDidChange']]
+ );
+});
+
+QUnit.test(`regression test for https://github.com/emberjs/ember.js/issues/12475`, function() {
+ let item1a = { id: 1 };
+ let item1b = { id: 2 };
+ let item1c = { id: 3 };
+ let content1 = A([item1a, item1b, item1c]);
+
+ let proxy = ArrayProxy.create({ content: content1 });
+ let obj = { proxy };
+
+ defineProperty(obj, 'ids', computed('proxy.@each.id', function() {
+ return get(this, 'proxy').mapBy('id');
+ }));
+
+ // These manually added observers are to simulate the observers added by the
+ // rendering process in a template like:
+ //
+ // {{#each items as |item|}}
+ // {{item.id}}
+ // {{/each}}
+ addObserver(item1a, 'id', function() { });
+ addObserver(item1b, 'id', function() { });
+ addObserver(item1c, 'id', function() { });
+
+ // The EachProxy has not yet been consumed. Only the manually added
+ // observers are watching.
+ equal(watcherCount(item1a, 'id'), 1);
+ equal(watcherCount(item1b, 'id'), 1);
+ equal(watcherCount(item1c, 'id'), 1);
+
+ // Consume the each proxy. This causes the EachProxy to add two observers
+ // per item: one for "before" events and one for "after" events.
+ deepEqual(get(obj, 'ids'), [1, 2, 3]);
+
+ // For each item, the two each proxy observers and one manual added observer
+ // are watching.
+ equal(watcherCount(item1a, 'id'), 3);
+ equal(watcherCount(item1b, 'id'), 3);
+ equal(watcherCount(item1c, 'id'), 3);
+
+ // This should be a no-op because observers do not fire if the value
+ // 1. is an object and 2. is the same as the old value.
+ proxy.set('content', content1);
+
+ equal(watcherCount(item1a, 'id'), 3);
+ equal(watcherCount(item1b, 'id'), 3);
+ equal(watcherCount(item1c, 'id'), 3);
+
+ // This is repeated to catch the regression. It should still be a no-op.
+ proxy.set('content', content1);
+
+ equal(watcherCount(item1a, 'id'), 3);
+ equal(watcherCount(item1b, 'id'), 3);
+ equal(watcherCount(item1c, 'id'), 3);
+
+ // Set the content to a new array with completely different items and
+ // repeat the process.
+ let item2a = { id: 4 };
+ let item2b = { id: 5 };
+ let item2c = { id: 6 };
+ let content2 = A([item2a, item2b, item2c]);
+
+ addObserver(item2a, 'id', function() { });
+ addObserver(item2b, 'id', function() { });
+ addObserver(item2c, 'id', function() { });
+
+ proxy.set('content', content2);
+
+ deepEqual(get(obj, 'ids'), [4, 5, 6]);
+
+ equal(watcherCount(item2a, 'id'), 3);
+ equal(watcherCount(item2b, 'id'), 3);
+ equal(watcherCount(item2c, 'id'), 3);
+
+ // Ensure that the observers added by the EachProxy on all items in the
+ // first content array have been torn down.
+ equal(watcherCount(item1a, 'id'), 1);
+ equal(watcherCount(item1b, 'id'), 1);
+ equal(watcherCount(item1c, 'id'), 1);
+
+ proxy.set('content', content2);
+
+ equal(watcherCount(item2a, 'id'), 3);
+ equal(watcherCount(item2b, 'id'), 3);
+ equal(watcherCount(item2c, 'id'), 3);
+
+ proxy.set('content', content2);
+
+ equal(watcherCount(item2a, 'id'), 3);
+ equal(watcherCount(item2b, 'id'), 3);
+ equal(watcherCount(item2c, 'id'), 3);
+}); | true |
Other | emberjs | ember.js | d7948a4202959a1831872ec579249138534dabc8.json | remove comment referring to DeferredMixin | packages/ember/tests/routing/basic_test.js | @@ -968,7 +968,7 @@ asyncTest("The Special page returning an error fires the error hook on SpecialRo
var menuItem;
- App.MenuItem = Ember.Object.extend(Ember.DeferredMixin);
+ App.MenuItem = Ember.Object.extend();
App.MenuItem.reopenClass({
find: function(id) {
menuItem = App.MenuItem.create({ id: id }); | false |
Other | emberjs | ember.js | aa2cbd87758f2408ba6e4b9e4cd0d3a86f62819c.json | add assertion for {{#each foo in bar}} syntax | packages/ember-template-compiler/lib/index.js | @@ -16,6 +16,7 @@ import TransformEachIntoCollection from 'ember-template-compiler/plugins/transfo
import TransformUnescapedInlineLinkTo from 'ember-template-compiler/plugins/transform-unescaped-inline-link-to';
import AssertNoViewAndControllerPaths from 'ember-template-compiler/plugins/assert-no-view-and-controller-paths';
import AssertNoViewHelper from 'ember-template-compiler/plugins/assert-no-view-helper';
+import AssertNoEachIn from 'ember-template-compiler/plugins/assert-no-each-in';
// used for adding Ember.Handlebars.compile for backwards compat
import 'ember-template-compiler/compat';
@@ -29,6 +30,7 @@ registerPlugin('ast', TransformAngleBracketComponents);
registerPlugin('ast', TransformInputOnToOnEvent);
registerPlugin('ast', TransformTopLevelComponents);
registerPlugin('ast', TransformUnescapedInlineLinkTo);
+registerPlugin('ast', AssertNoEachIn);
if (_Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
registerPlugin('ast', TransformEachIntoCollection); | true |
Other | emberjs | ember.js | aa2cbd87758f2408ba6e4b9e4cd0d3a86f62819c.json | add assertion for {{#each foo in bar}} syntax | packages/ember-template-compiler/lib/plugins/assert-no-each-in.js | @@ -0,0 +1,41 @@
+import Ember from 'ember-metal/core';
+import { assert } from 'ember-metal/debug';
+import calculateLocationDisplay from 'ember-template-compiler/system/calculate-location-display';
+
+function AssertNoEachIn(options = {}) {
+ this.syntax = null;
+ this.options = options;
+}
+
+AssertNoEachIn.prototype.transform = function AssertNoEachIn_transform(ast) {
+ if (!!Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+ return ast;
+ }
+ let walker = new this.syntax.Walker();
+ let moduleName = this.options && this.options.moduleName;
+
+ walker.visit(ast, function(node) {
+ if (!validate(node)) { return; }
+ assertHelper(moduleName, node);
+ });
+
+ return ast;
+};
+
+function assertHelper(moduleName, node) {
+ let moduleInfo = calculateLocationDisplay(moduleName, node.loc);
+ let singular = node.params[0].original;
+ let plural = node.params[2].original;
+
+ assert(`Using {{#each ${singular} in ${plural}}} ${moduleInfo}is no longer supported in Ember 2.0+, please use {{#each ${plural} as |${singular}|}}`);
+}
+
+function validate(node) {
+ return (node.type === 'BlockStatement' || node.type === 'MustacheStatement') &&
+ node.path.original === 'each' &&
+ node.params.length === 3 &&
+ node.params[1].type === 'PathExpression' &&
+ node.params[1].original === 'in';
+}
+
+export default AssertNoEachIn; | true |
Other | emberjs | ember.js | aa2cbd87758f2408ba6e4b9e4cd0d3a86f62819c.json | add assertion for {{#each foo in bar}} syntax | packages/ember-template-compiler/lib/plugins/transform-each-in-to-hash.js | @@ -1,73 +0,0 @@
-/**
-@module ember
-@submodule ember-htmlbars
-*/
-
-
-/**
- An HTMLBars AST transformation that replaces all instances of
-
- ```handlebars
- {{#each item in items}}
- {{/each}}
- ```
-
- with
-
- ```handlebars
- {{#each items keyword="item"}}
- {{/each}}
- ```
-
- @class TransformEachInToHash
- @private
-*/
-function TransformEachInToHash(options = {}) {
- // set later within HTMLBars to the syntax package
- this.syntax = null;
- this.options = options;
-}
-
-/**
- @private
- @method transform
- @param {AST} ast The AST to be transformed.
-*/
-TransformEachInToHash.prototype.transform = function TransformEachInToHash_transform(ast) {
- var pluginContext = this;
- var walker = new pluginContext.syntax.Walker();
- var b = pluginContext.syntax.builders;
-
- walker.visit(ast, function(node) {
- if (pluginContext.validate(node)) {
- if (node.program && node.program.blockParams.length) {
- throw new Error('You cannot use keyword (`{{each foo in bar}}`) and block params (`{{each bar as |foo|}}`) at the same time.');
- }
-
- var removedParams = node.sexpr.params.splice(0, 2);
- var keyword = removedParams[0].original;
-
- // TODO: This may not be necessary.
- if (!node.sexpr.hash) {
- node.sexpr.hash = b.hash();
- }
-
- node.sexpr.hash.pairs.push(b.pair(
- 'keyword',
- b.string(keyword)
- ));
- }
- });
-
- return ast;
-};
-
-TransformEachInToHash.prototype.validate = function TransformEachInToHash_validate(node) {
- return (node.type === 'BlockStatement' || node.type === 'MustacheStatement') &&
- node.sexpr.path.original === 'each' &&
- node.sexpr.params.length === 3 &&
- node.sexpr.params[1].type === 'PathExpression' &&
- node.sexpr.params[1].original === 'in';
-};
-
-export default TransformEachInToHash; | true |
Other | emberjs | ember.js | aa2cbd87758f2408ba6e4b9e4cd0d3a86f62819c.json | add assertion for {{#each foo in bar}} syntax | packages/ember-template-compiler/tests/plugins/assert-no-each-in-test.js | @@ -0,0 +1,47 @@
+import Ember from 'ember-metal/core';
+import { compile } from 'ember-template-compiler';
+
+let legacyViewSupportOriginalValue;
+
+QUnit.module('ember-template-compiler: assert-no-each-in-test without legacy view support', {
+ setup() {
+ legacyViewSupportOriginalValue = Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT;
+ Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT = false;
+ },
+
+ teardown() {
+ Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT = legacyViewSupportOriginalValue;
+ }
+});
+
+QUnit.test('{{#each foo in bar}} is not allowed', function() {
+ expect(1);
+
+ expectAssertion(function() {
+ compile('{{#each person in people}}{{person.name}}{{/each}}', {
+ moduleName: 'foo/bar/baz'
+ });
+ }, `Using {{#each person in people}} ('foo/bar/baz' @ L1:C0) is no longer supported in Ember 2.0+, please use {{#each people as |person|}}`);
+});
+
+
+QUnit.module('ember-template-compiler: assert-no-each-in-test with legacy view support', {
+ setup() {
+ legacyViewSupportOriginalValue = Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT;
+ Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT = true;
+ },
+
+ teardown() {
+ Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT = legacyViewSupportOriginalValue;
+ }
+});
+
+QUnit.test('{{#each foo in bar}} is allowed', function() {
+ expect(1);
+
+ compile('{{#each person in people}}{{person.name}}{{/each}}', {
+ moduleName: 'foo/bar/baz'
+ });
+
+ ok(true);
+}); | true |
Other | emberjs | ember.js | a35aec07448da2675636488ca22cc44a8b1d9ce5.json | Prevent CI from caching glimmer-engine. | .travis.yml | @@ -23,6 +23,7 @@ before_install:
wget -O /tmp/phantomjs-`phantomjs --version`-linux-x86_64-symbols.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-`phantomjs --version`-linux-x86_64-symbols.tar.bz2 &&
tar -xjvf /tmp/phantomjs-`phantomjs --version`-linux-x86_64-symbols.tar.bz2 -C ./phantomjs;
fi
+ - "rm -rf node_modules/glimmer-engine"
install:
- "npm install" | false |
Other | emberjs | ember.js | bd7e2120d474ca3d37d957aaa213f50405fba160.json | Increase test timeout for IE on CI | testem.dist.json | @@ -1,6 +1,6 @@
{
"framework": "qunit",
- "test_page": "dist/tests/index.html?hidepassed&hideskipped",
+ "test_page": "dist/tests/index.html?hidepassed&hideskipped&timeout=60000",
"timeout": 540,
"parallel": 4,
"disable_watching": true,
@@ -36,10 +36,6 @@
"SL_IE_9": {
"command": "npm run sauce:launch -- -b 'internet explorer' -v 9 --no-ct -u <url>",
"protocol": "tap"
- },
- "SL_IE_8": {
- "command": "npm run sauce:launch -- -b 'internet explorer' -v 8 --no-ct -u <url>",
- "protocol": "tap"
}
},
"launch_in_dev": ["PhantomJS"], | true |
Other | emberjs | ember.js | bd7e2120d474ca3d37d957aaa213f50405fba160.json | Increase test timeout for IE on CI | tests/index.html | @@ -146,7 +146,7 @@
setupQUnit(testHelpers);
// Tests should time out after 15 seconds
- QUnit.config.testTimeout = 15000;
+ QUnit.config.testTimeout = QUnit.urlParams.timeout ? parseInt(QUnit.urlParams.timeout, 10) : 15000;
// Hide skipped tests
QUnit.config.urlConfig.push({ id: 'hideskipped', label: "Hide skipped tests"});
// Handle testing feature flags | true |
Other | emberjs | ember.js | 36bb816ae8fac449a09916a5c65cd5049d93bdc4.json | Fix misc typos and grammar | bin/bower_ember_build | @@ -6,10 +6,10 @@ git config --global user.name "Tomster"
# This specifies the repository we are going to work with. This will most likely be set to 'ember'
COMPONENTS_EMBER_REPO_SLUG="components/ember"
-# This specifies the user who is associated to the GH_TOKEN
+# This specifies the user who is associated to the GH_TOKEN.
USER="rwjblue"
-# This ensure that no directories within dist will be copied when script is run.
+# This ensures that no directories within dist will be copied when script is run.
INCLUDED_FILES=`find dist -maxdepth 1 -type f`
echo -e "COMPONENTS_EMBER_REPO_SLUG: ${COMPONENTS_EMBER_REPO_SLUG}\n"
@@ -27,7 +27,7 @@ if [[ -z $GH_TOKEN ]]; then
exit 0
fi
-# Set channel to publish to. If no suitable branch is found exit successfully.
+# Set channel to publish to. If no suitable branch is found, exit successfully.
case $TRAVIS_BRANCH in
"master" )
CHANNEL="canary" ;;
@@ -47,18 +47,18 @@ case $TRAVIS_BRANCH in
esac
echo -e "CHANNEL: ${CHANNEL}\n"
-# sending output to /dev/null to prevent GH_TOKEN leak on error
+# Sending output to /dev/null to prevent GH_TOKEN leak on error.
git clone --branch ${CHANNEL} https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_REPO_SLUG}.git bower_ember &> /dev/null
rm -rf bower_ember/*
cp -r ${INCLUDED_FILES} bower_ember/
cd bower_ember
git remote rm origin
-# sending output to /dev/null to prevent GH_TOKEN leak on error
+# Sending output to /dev/null to prevent GH_TOKEN leak on error.
git remote add origin https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_REPO_SLUG}.git &> /dev/null
git add -A
git commit -m "Ember Bower Auto build for https://github.com/emberjs/ember.js/commits/${TRAVIS_COMMIT}."
-# sending output to /dev/null to prevent GH_TOKEN leak on error
+# Sending output to /dev/null to prevent GH_TOKEN leak on error.
git push -fq origin ${CHANNEL} &> /dev/null
echo -e "Done\n" | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.