Merge 3-0-stable to master #5158
Merged
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 2.1] Fix shipments admin/enterprises and api/enterprises controller specs
[Spree 2.1] PG::ProtocolViolation: ERROR: bind message supplies 0 parameters...
…e modifications the tagRuleApplicator does on it will remain Reject on ActiveRecord_Associations_CollectionProxy wont work
…c around refreshing shipping rates doesnt fail badly
Api::BaseController#authenticate is already taking care of the unauthenticated use case when spree_current_user is nil
…thentication and fix problem with saving params[:user_ids]
…o test a guest checkout, which is what happens in the real checkout
…assword confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password])
This is causing several specs to fail on rollback and, according to some manual testing (and all the auto tests we have), we dont need this fix in OFN
Fixes:
2) spree/admin/orders/index.html.haml print invoices button displays button when invoices are enabled
Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
ActionView::Template::Error:
No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
# ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
# ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:26:in `block (3 levels) in <top (required)>'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActionController::UrlGenerationError:
# No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
3) spree/admin/orders/index.html.haml print invoices button does not display button when invoices are disabled
Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
ActionView::Template::Error:
No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
# ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
# ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:34:in `block (3 levels) in <top (required)>'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActionController::UrlGenerationError:
# No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
[Spree 2.1] Change Shipment#manifest to include deleted variants (again, this time in rails 4)
[Spree 2.1] Fix issues in EnterprisesController
[Spree 2.1] Delete unnecessary code related to spree_auth_devise
[Spree 2.1] Fix tag rule applicator in enterprises_helper
[Spree 2.1] Fix authentication spec by adapting code to devise 3
Fix problem with misssing params in schedules controller
Fixes:
2) full-page cart viewing the cart updating quantities with insufficient stock available shows the quantities saved, not those submitted
Failure/Error: @app.call(env)
AbstractController::ActionNotFound:
The action 'update' could not be found for CartController
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# Capybara::ExpectationNotMet:
# expected to find text "Insufficient stock available, only 2 remaining" in "Internal Server Error The action 'update' could not be found for CartController WEBrick/1.3.1 (Ruby/2.3.7/2018-03-28) at 127.0.0.1:38614"
# ./spec/features/consumer/shopping/cart_spec.rb:182:in `block (5 levels) in <top (required)>'
Rails 4 does not recognise requests to destroy routes without ids as valid routes.
Fixes:
14) LineItemsController destroying a line item on a completed order without a line item id fails and raises an error
Failure/Error: delete :destroy
ActionController::UrlGenerationError:
No route matches {:action=>"destroy", :controller=>"line_items"}
# ./spec/controllers/line_items_controller_spec.rb:46:in `block (5 levels) in <top (required)>'
[Spree 2.1] Line items destroy route
[Spree 2.1] Fix order index search form
This will enable us to upgrade these dependencies independently
[Spree 2.1] Move all spree_core dependencies to OFN so we can upgrade them later
…the const is stubbed otherwise the controller will be broken See details here: rspec/rspec-mocks#1079 (comment)
luisramos0
changed the title
[Spree 2.1] Merge master into 3-0-stable
[Spree 2.1] Fix "subquery has too many columns" in reports query
…the controller does not use an already loaded version of current_spree_user that still has enough permissions
It's not the most important spec, this scenario should never happen as the user will not be able to access the page.
[Spree 2.1] Make Variant Overrides spec less flaky and... comment it anyway
Fix outstanding Rubocop violations
Comment out Exchange Products Renderer spec
Comment out flaky variant overrides spec
This was referenced Jun 16, 2020
Closed
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.
2-0-stable was merged in #3742 with:
v2 was 790 commits:
Here we are currently at:
v3 is 362 commits.
v3 has quite a lot of lines and commits, not good indicators of how easy this one was compared to the previous one :-)