-
Notifications
You must be signed in to change notification settings - Fork 97
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
Catch 2-4-stable up with Master #94
Open
davekiss
wants to merge
42
commits into
spree-contrib:2-4-stable
Choose a base branch
from
davekiss:2-4-stable
base: 2-4-stable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Spree master moved on to 3.0.0.beta
This conversion is done by Transpec 3.1.0 with the following command: transpec * 71 conversions from: obj.should to: expect(obj).to * 24 conversions from: == expected to: eq(expected) * 10 conversions from: obj.should_receive(:message) to: expect(obj).to receive(:message) * 8 conversions from: lambda { }.should to: expect { }.to * 4 conversions from: obj.should_not to: expect(obj).not_to * 3 conversions from: it { should ... } to: it { is_expected.to ... } * 2 conversions from: obj.should_not_receive(:message) to: expect(obj).not_to receive(:message) * 1 conversion from: lambda { }.should_not to: expect { }.not_to * 1 conversion from: obj.should_receive(:message).and_return { value } to: obj.should_receive(:message) { value } For more details: https://github.com/yujinakayama/transpec#supported-conversions
This conversion is done by Transpec 3.1.0 with the following command: transpec * 6 conversions from: obj.stub(:message => value) to: allow(obj).to receive_messages(:message => value) For more details: https://github.com/yujinakayama/transpec#supported-conversions
Greener specs
Master goes against 3.0
Update badges for new repo
Update badges for new repo
updates from davekiss
Cherry picked redirect fix from 3-0-stable
…rrent master branch of spree/spree) According to Versionfile, master branch is compatible with spree 3.1, but gemspec was still set at `~> 3.0.0` and Gemfile to '3-0-stable' branch of spree/spree. update gemspec to match Versionfile (spree 3.1)
update gemspec to match Versionfile (spree 3.1)
This reverts commit dcde059 which breaks on 2-4-stable.
The changes look okay to me, but I haven't manually tested things out. |
@JDutil pushing to staging app now, will report back |
@JDutil works like a charm on my end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges in the changes that have occurred on Master over the past few months.
Also, I do believe that
line_items.digital?
should report as digital if the master variant is digital. That way, a user can be issued download links from the master variant, regardless of if their purchased variant is digital or not.This would allow you to send out any common downloads via the master variant, and then send out variant-specific downloads with each variant.