Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maker: Enable/disable via settings cog #14118

Merged

Conversation

islemaster
Copy link
Contributor

Reverts #14117, restoring #13958.

The original version of the feature broke applab/scenarios.feature, which does not run in Circle (disabled in #11908 due to high flakiness in that environment). Will be fixed by updating tests to use the settings cog to open the asset manager.

@islemaster islemaster merged commit 992334c into staging Apr 1, 2017
@islemaster islemaster deleted the revert-14117-revert-13958-maker-enable-from-menu branch April 1, 2017 00:04
Copy link
Contributor

@caleybrock caleybrock left a comment

Choose a reason for hiding this comment

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

I only looked at the newest commits but everything looks good to me. Thanks for fixing!

return style;
},

hideToolboxIcon() {
Copy link
Contributor

Choose a reason for hiding this comment

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

At first I thought these names were a little confusing because they seem like verbs, but I think it makes sense with the toggle function.

@@ -90,7 +90,8 @@ Feature: App Lab Scenarios
@no_mobile
Scenario: Upload Image Asset
When I press "designModeButton"
And I press "manage-assets-button"
And I press the settings cog
Copy link
Contributor

Choose a reason for hiding this comment

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

Learned what a cog is today - I always just called it a gear

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants