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

Build fixes #62

Merged
merged 10 commits into from
May 29, 2020
Merged

Build fixes #62

merged 10 commits into from
May 29, 2020

Conversation

mamhoff
Copy link
Contributor

@mamhoff mamhoff commented May 15, 2020

This fixes the install generator (require the correct file from Alchemy 5, and fix a bizarre validation error when creating the admin user) and includes the correct view helper in our view specs.

It also fixes the branch of alchemy-devise to always be master. Alchemy Devise doesn't do a lot, and importantly runs specs for the past three Alchemy versions on its own.

We also upgrade the Travis image to Ubuntu 18.04 for an up-to-date node version.

For some reason creating a user with Spree::Roles fails, and this little
trick fixes it.
mamhoff added 2 commits May 29, 2020 10:31
Previously, these only included the `EssencesHelper`. However, the
method `content_name` is defined in the `Alchemy::ContentsHelper`.

Including the `Alchemy::ElementsHelper` gets us both helpers, fixing the
issue.
Let's support 3 versions and master.
@mamhoff mamhoff force-pushed the build-fixes branch 3 times, most recently from c218793 to cd0fcb1 Compare May 29, 2020 09:57
mamhoff added 6 commits May 29, 2020 12:12
The Solidus install generator from 2.8 onwards does not insert mounting
the Solidus engine, it only adds a comment. The Alchemy generator
inserts this only if it's not already here. The safest option is to
simply have all the things in our routes.rb file.
Alchemy-Devise takes care of its own compatibility.
@mamhoff mamhoff requested a review from tvdeyen May 29, 2020 10:25
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Wow. Thanks 👏
Just one minor nit about the Alchemy version

@mamhoff mamhoff merged commit 5bfe244 into AlchemyCMS:master May 29, 2020
@mamhoff mamhoff deleted the build-fixes branch May 29, 2020 13:41
tvdeyen added a commit that referenced this pull request Jun 11, 2020
- Ignore .ruby-version [\#63](#63) ([mamhoff](https://github.com/mamhoff))
- Build fixes [\#62](#62) ([mamhoff](https://github.com/mamhoff))
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.

2 participants