raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9889 from mkllnk/dfc-products

Browse Source 
Activate DfcProvider with feature toggle, not prod
This commit is contained in:
Sigmund Petersen
2022-11-16 12:26:44 +01:00
committed by GitHub
parent 1688bf09e3 56667f6142
commit 52487a270d
11 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/constraints/feature_toggle_constraint.rb
View File

@@ -1,5 +1,7 @@
# frozen_string_literal: true
require "open_food_network/feature_toggle"
class FeatureToggleConstraint
def initialize(feature_name)
@feature = feature_name
@@ -10,6 +12,6 @@ class FeatureToggleConstraint
end
def current_user(request)
request.env['warden'].user
request.env['warden']&.user
end
end

2
config/routes.rb
View File

@@ -117,7 +117,7 @@ Openfoodnetwork::Application.routes.draw do
get 'sitemap.xml', to: 'sitemap#index', defaults: { format: 'xml' }
unless Rails.env.production?
constraints FeatureToggleConstraint.new(:dfc_provider) do
# Mount DFC API endpoints
mount DfcProvider::Engine, at: '/'
end

1
spec/base_spec_helper.rb
View File

@@ -129,7 +129,6 @@ RSpec.configure do |config|
config.include Spree::UrlHelpers
config.include Spree::MoneyHelper
config.include PreferencesHelper
config.include OpenFoodNetwork::FeatureToggleHelper
config.include OpenFoodNetwork::FiltersHelper
config.include OpenFoodNetwork::EnterpriseGroupsHelper
config.include OpenFoodNetwork::ProductsHelper

5
spec/controllers/payment_gateways/stripe_controller_spec.rb
View File

@@ -88,10 +88,7 @@ module PaymentGateways
context "using split checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout) { true }
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything) { true }
Flipper.enable(:split_checkout)
order.update_attribute :state, "confirmation"
end

5
spec/controllers/split_checkout_controller_spec.rb
View File

@@ -16,10 +16,7 @@ describe SplitCheckoutController, type: :controller do
let(:shipping_method) { distributor.shipping_methods.first }
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout) { true }
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything) { true }
Flipper.enable(:split_checkout)
exchange.variants << order.line_items.first.variant
allow(controller).to receive(:current_order) { order }

4
spec/routing/stripe_spec.rb
View File

@@ -3,10 +3,6 @@
require "spec_helper"
describe "routing for Stripe return URLS", type: :routing do
before do
allow_any_instance_of(FeatureToggleConstraint).to receive(:current_user) { build(:user) }
end
context "checkout return URLs" do
it "routes /checkout to checkout#edit" do
expect(get: "checkout").

11
spec/support/feature_toggle_helper.rb
View File

@@ -1,11 +0,0 @@
# frozen_string_literal: true
module OpenFoodNetwork
module FeatureToggleHelper
def set_feature_toggle(feature, status)
features = OpenFoodNetwork::FeatureToggle.features
features[feature] = status
allow(OpenFoodNetwork::FeatureToggle).to receive(:features) { features }
end
end
end

3
spec/system/consumer/shopping/checkout_auth_spec.rb
View File

@@ -83,8 +83,7 @@ describe "As a consumer I want to check out my cart", js: true do
context "split checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout) { true }
allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout, anything) { true }
Flipper.enable(:split_checkout)
end
include_examples "with different checkout types", "split_checkout"
end

3
spec/system/consumer/split_checkout_spec.rb
View File

@@ -65,8 +65,7 @@ describe "As a consumer, I want to checkout my order", js: true do
}
before do
allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout).and_return(true)
allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout, anything).and_return(true)
Flipper.enable(:split_checkout)
add_enterprise_fee enterprise_fee
set_order order

10
spec/system/consumer/split_checkout_tax_incl_spec.rb
View File

@@ -111,10 +111,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
context "on split-checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout).and_return(true)
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything).and_return(true)
Flipper.enable(:split_checkout)
set_order order_within_zone
login_as(user_within_zone)
@@ -171,10 +168,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
context "on split-checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout).and_return(true)
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything).and_return(true)
Flipper.enable(:split_checkout)
set_order order_outside_zone
login_as(user_outside_zone)

10
spec/system/consumer/split_checkout_tax_not_incl_spec.rb
View File

@@ -118,10 +118,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
context "on split-checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout).and_return(true)
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything).and_return(true)
Flipper.enable(:split_checkout)
set_order order_within_zone
login_as(user_within_zone)
@@ -181,10 +178,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
context "on split-checkout" do
before do
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout).and_return(true)
allow(OpenFoodNetwork::FeatureToggle).
to receive(:enabled?).with(:split_checkout, anything).and_return(true)
Flipper.enable(:split_checkout)
set_order order_outside_zone
login_as(user_outside_zone)