Skip to content

[Feature] module unification controller & controller-test blueprints#16656

Merged
rwjblue merged 1 commit intoemberjs:masterfrom
dexturr:WIP-module-unification-controllers
May 18, 2018
Merged

[Feature] module unification controller & controller-test blueprints#16656
rwjblue merged 1 commit intoemberjs:masterfrom
dexturr:WIP-module-unification-controllers

Conversation

@dexturr
Copy link
Copy Markdown

@dexturr dexturr commented May 18, 2018

Part of ember-cli/ember-cli#7530

Module unification blueprints for controller and controller-test files. This was pair programmed by @kevinansfield and I at the Ember London Project Night.

Many thanks to @GavinJoyce for showing us what to do and walking us through module unification.

@@ -0,0 +1,13015 @@
{
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you delete this file?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed 👍

import Controller from '@ember/controller';

export default Controller.extend({
});
Copy link
Copy Markdown
Member

@GavinJoyce GavinJoyce May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like it has the same content as the existing https://github.com/dexturr/ember.js/blob/d23b14d99095c062693193e447b0ca578006e063/blueprints/controller/files/__root__/__path__/__name__.js. Perhaps we can use that for both and delete this file?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, was copying the pattern of components but this is unnecessary here. Have done this now 👍

);
});
});
});
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps it would be good to add a test for a nested controller tests for addons and apps for both MU and classic? we seem to be missing those test cases

@GavinJoyce
Copy link
Copy Markdown
Member

This is great! Nice one!

I've added one final comment. Perhaps you might also squash down to a single commit when you can?

Remove missed comment


Remove packagelock.json


Remove uneeded file are per PR comments


Add tests for nested components
@dexturr dexturr force-pushed the WIP-module-unification-controllers branch from f6e6087 to 8caa131 Compare May 18, 2018 13:22
@dexturr
Copy link
Copy Markdown
Author

dexturr commented May 18, 2018

@GavinJoyce Squashed and new tests added 👍

@GavinJoyce
Copy link
Copy Markdown
Member

CI failure seems to be flakiness:

screen shot 2018-05-18 at 15 43 23

@dexturr
Copy link
Copy Markdown
Author

dexturr commented May 18, 2018

Am I able to rerun the build? I couldn't seem to find the option or do I need to make a whitespace commit?

@rwjblue
Copy link
Copy Markdown
Member

rwjblue commented May 18, 2018

Yep, restarted!

@GavinJoyce
Copy link
Copy Markdown
Member

👍 great work @dexturr @kevinansfield 👏

@rwjblue rwjblue merged commit 841a04f into emberjs:master May 18, 2018
@dexturr dexturr deleted the WIP-module-unification-controllers branch August 2, 2018 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants