solidus_paypal_commerce_platform 0.1.0 → 0.3.1

data/spec/lib/solidus_paypal_commerce_platform/client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe SolidusPaypalCommercePlatform::Client do
     let(:status_code) { 201 }
 
     it 'forwards to the upstream client adding i18n response messages' do
-      expect_any_instance_of(PayPal::PayPalHttpClient)
+      allow_any_instance_of(PayPal::PayPalHttpClient)
         .to receive(:execute).with(paypal_request).and_return(paypal_response)
 
       response = subject.execute_with_response(paypal_request)

data/spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb

@@ -12,16 +12,16 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
     it "falls back to Rails.env if ENV['PAYPAL_ENV'] is not set" do
       expect(ENV).to receive(:[]).with("PAYPAL_ENV").and_return(nil).at_least(:once)
 
-      expect(Rails).to receive(:env).and_return("development".inquiry)
+      allow(Rails).to receive(:env).and_return("development".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("test".inquiry)
+      allow(Rails).to receive(:env).and_return("test".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("production".inquiry)
+      allow(Rails).to receive(:env).and_return("production".inquiry)
       expect(subject.default_env).to eq("live")
 
-      expect(Rails).to receive(:env).and_return("staging".inquiry)
+      allow(Rails).to receive(:env).and_return("staging".inquiry)
       expect{ subject.default_env }.to raise_error(described_class::InvalidEnvironment)
     end
   end
@@ -82,4 +82,10 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
       expect(subject.state_guesser_class).to eq(SolidusPaypalCommercePlatform::BetterStateGuesser)
     end
   end
+
+  describe "#partner_code" do
+    it "returns the correct code" do
+      expect(subject.partner_code).to eq("Solidus_PCP_SP")
+    end
+  end
 end

data/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb

@@ -92,6 +92,25 @@ RSpec.describe SolidusPaypalCommercePlatform::PaymentMethod, type: :model do
         expect(url.query.split("&")).to include("commit=true")
       end
     end
+
+    context 'when messaging is turned on' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'includes messaging component' do
+        paypal_payment_method.preferences.update(display_credit_messaging: true)
+        expect(url.query.split("&")).to include("components=buttons%2Cmessages")
+      end
+    end
+
+    context 'when messaging is turned off' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'only includes buttons components' do
+        paypal_payment_method.preferences.update(display_credit_messaging: false)
+        expect(url.query.split("&")).not_to include("messages")
+        expect(url.query.split("&")).to include("components=buttons")
+      end
+    end
   end
 
   private

data/spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
   let(:order) { create(:order) }
   let(:original_address) { create(:address) }
-  let(:address) { create(:address) }
+  let(:address) { create(:address, name_attributes) }
   let(:params) {
     {
       updated_address: {
@@ -16,8 +16,8 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       },
       recipient: {
         name: {
-          given_name: address.firstname,
-          surname: address.lastname
+          given_name: "Alexander",
+          surname: "Hamilton"
         }
       }
     }
@@ -37,8 +37,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       expect(subject.address2).to eq address.address2
       expect(subject.zipcode).to eq address.zipcode
       expect(subject.country).to eq address.country
-      expect(subject.firstname).to eq address.firstname
-      expect(subject.lastname).to eq address.lastname
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        expect(subject.name).to eq address.name
+      else
+        expect(subject.firstname).to eq address.firstname
+        expect(subject.lastname).to eq address.lastname
+      end
       expect(subject.phone).to eq original_address.phone
     end
 
@@ -52,4 +56,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       end
     end
   end
+
+  def name_attributes
+    if SolidusSupport.combined_first_and_last_name_in_address?
+      { name: "Alexander Hamilton" }
+    else
+      { firstname: "Alexander", lastname: "Hamilton" }
+    end
+  end
 end

data/spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_http_status(:ok)
       end
     end
 
@@ -29,7 +29,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_http_status(:bad_request)
       end
     end
   end

data/spec/requests/solidus_paypal_commerce_platform/shipping_rates_controller_spec.rb

@@ -23,9 +23,9 @@ RSpec.describe SolidusPaypalCommercePlatform::ShippingRatesController, type: :re
       }
     end
 
-    it "returns a paypal_order with the new address" do
-      expect(response.body).to include new_address.state.abbr
-      expect(response.body).not_to include order.ship_address.state.abbr
+    it "returns a paypal_order without the simulated address" do
+      expect(response.body).not_to include "admin_area_1\":\"#{new_address.state.abbr}\""
+      expect(response.body).not_to include "admin_area_1\":\"#{order.ship_address.state.abbr}\""
     end
 
     it "does not modify original address" do

data/spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe SolidusPaypalCommercePlatform::WizardController, type: :request d
 
       expect(payment_method.preferred_client_id).to eq("CLIENT-ID")
       expect(payment_method.preferred_client_secret).to eq("CLIENT-SECRET")
-      expect(response).to have_http_status(201)
+      expect(response).to have_http_status(:created)
     end
   end
 end

data/spec/spec_helper.rb

@@ -19,8 +19,8 @@ require 'spree/testing_support/order_walkthrough'
 # in spec/support/ and its subdirectories.
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_paypal_commerce_platform/factories.rb
-require 'solidus_paypal_commerce_platform/factories'
+# Requires factories defined in lib/solidus_paypal_commerce_platform/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusPaypalCommercePlatform::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

data/spec/support/paypal_sdk_script_tag_helper.rb

@@ -0,0 +1,13 @@
+module PaypalSdkScriptTagHelper
+  def js_sdk_script_query
+    URI(page.find('script[src*="sdk/js?"]', visible: false)[:src]).query.split('&')
+  end
+
+  def js_sdk_script_partner_id
+    page.find('script[src*="sdk/js?"]', visible: false)['data-partner-attribution-id']
+  end
+end
+
+RSpec.configure do |config|
+  config.include PaypalSdkScriptTagHelper, type: :feature
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -34,7 +34,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,35 +44,41 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: solidus_webhooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: paypal-checkout-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -105,16 +111,16 @@ dependencies:
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description:
 email: contact@solidus.io
 executables: []
@@ -124,9 +130,11 @@ files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
 - ".github/stale.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -145,7 +153,7 @@ files:
 - app/controllers/solidus_paypal_commerce_platform/paypal_orders_controller.rb
 - app/controllers/solidus_paypal_commerce_platform/shipping_rates_controller.rb
 - app/controllers/solidus_paypal_commerce_platform/wizard_controller.rb
-- app/decorators/solidus_paypal_commerce_platform/remove_required_phone_from_address.rb
+- app/decorators/models/solidus_paypal_commerce_platform/spree/address_decorator.rb
 - app/helpers/solidus_paypal_commerce_platform/button_options_helper.rb
 - app/jobs/solidus_paypal_commerce_platform/application_job.rb
 - app/jobs/solidus_paypal_commerce_platform/webhook_job.rb
@@ -179,13 +187,14 @@ files:
 - config/routes.rb
 - db/migrate/20200521190038_add_paypal_commerce_platform_sources.rb
 - lib/generators/solidus_paypal_commerce_platform/install/install_generator.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/initializer.rb
 - lib/solidus_paypal_commerce_platform.rb
 - lib/solidus_paypal_commerce_platform/access_token_authorization_request.rb
 - lib/solidus_paypal_commerce_platform/client.rb
 - lib/solidus_paypal_commerce_platform/configuration.rb
 - lib/solidus_paypal_commerce_platform/engine.rb
-- lib/solidus_paypal_commerce_platform/factories.rb
 - lib/solidus_paypal_commerce_platform/fetch_merchant_credentials_request.rb
+- lib/solidus_paypal_commerce_platform/testing_support/factories.rb
 - lib/solidus_paypal_commerce_platform/version.rb
 - lib/views/api/spree/api/payments/source_views/_paypal_commerce_platform.json.jbuilder
 - lib/views/backend/spree/admin/payments/source_forms/_paypal_commerce_platform.html.erb
@@ -194,6 +203,7 @@ files:
 - lib/views/frontend/solidus_paypal_commerce_platform/cart/_cart_buttons.html.erb
 - lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
 - lib/views/frontend/solidus_paypal_commerce_platform/product/_product_buttons.html.erb
+- lib/views/frontend/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb
 - lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
 - lib/views/frontend/spree/orders/payment/_paypal_commerce_platform.html.erb
 - lib/views/frontend/spree/products/payment/_paypal_commerce_platform.html.erb
@@ -223,12 +233,13 @@ files:
 - spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
-homepage: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
+- spec/support/paypal_sdk_script_tag_helper.rb
+homepage: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
-  source_code_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
+  homepage_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
+  source_code_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
   changelog_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/releases
 post_install_message:
 rdoc_options: []
@@ -236,7 +247,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -245,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Integrate Solidus with Paypal Commerce Platform
@@ -275,3 +286,4 @@ test_files:
 - spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
+- spec/support/paypal_sdk_script_tag_helper.rb

data/app/decorators/solidus_paypal_commerce_platform/remove_required_phone_from_address.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module RemoveRequiredPhoneFromAddress
-  # PayPal doesn't use the phone number, so in cases where the user checks out via
-  # PayPal, this field will be unpopulated. If you want to require phone numbers,
-  # you'll need to turn off cart & product page displays on the payment method edit
-  # page.
-  def require_phone?
-    super && false
-  end
-
-  ::Spree::Address.prepend self
-end