solidus_gateway 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: edb5286317a172fc0994ca78e1d5532a7c648cfd
-  data.tar.gz: b808a3847b095a1dfb4d44ded6c8a04639281f7d
+SHA256:
+  metadata.gz: c025fd33d729f47d657ff3cefcba4d26635266839cb08c3f06879d6c5dfa8542
+  data.tar.gz: eda6311a3cbbea6a82f0d5c54c88a5aca6e82a4f1e4328b0be1d43b1bda5bd7e
 SHA512:
-  metadata.gz: 18233008d74271e67a697f4705c6b67b3f80a502000522670baaf6944cb162c5eaf299bb5fe7b3c3dfd44315472b8b08d4018b270bd1bea59e626054fb2b2534
-  data.tar.gz: e7458514a6d6be0b16a51e610f47e61eca217d8fc3a858bf70f771cda35b17a2c71da427591ea7f03cb47287d1e0cb10e8c2359b2885b0ecc7c4e67b0e30e480
+  metadata.gz: 604d98c648d50d90284e3ad4ba83f7b6692126afe71bd166d2907724c27124fe051439d2d4ff2f8e6209e3c269c8677b5aec0e4fffe3dab7635e09d7384072fb
+  data.tar.gz: 3370a0c69d62df8a89df920c1a23d019a948085ce0accba5f8718496025b050f4095c07bff835b016d4c77e07bf2b2cd96b4749b8dff628cd602aa3bc635db94

data/.travis.yml

@@ -2,9 +2,13 @@ sudo: required
 dist: trusty
 cache: bundler
 language: ruby
+addons:
+  chrome: stable
 rvm:
-  - 2.3.1
+  - 2.5
 before_install:
+  - gem update --system
+  - gem install bundler
   - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'travis'@'%';"
 env:
   matrix:
@@ -16,6 +20,8 @@ env:
     - SOLIDUS_BRANCH=v2.1 DB=postgres
     - SOLIDUS_BRANCH=v2.2 DB=postgres
     - SOLIDUS_BRANCH=v2.3 DB=postgres
+    - SOLIDUS_BRANCH=v2.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.5 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
@@ -25,4 +31,6 @@ env:
     - SOLIDUS_BRANCH=v2.1 DB=mysql
     - SOLIDUS_BRANCH=v2.2 DB=mysql
     - SOLIDUS_BRANCH=v2.3 DB=mysql
+    - SOLIDUS_BRANCH=v2.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.5 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -7,11 +7,23 @@ if branch == 'master' || branch >= "v2.0"
   gem "rails-controller-testing", group: :test
 end
 
-gem 'pg'
-gem 'mysql2'
+# hacks to speed up bundler resolution
+if branch == 'master' || branch >= "v2.3"
+  gem 'rails', '~> 5.1.6'
+elsif branch >= "v2.0"
+  gem 'rails', '~> 5.0.7'
+else
+  gem "rails", "~> 4.2.10"
+end
+
+gem 'pg', '~> 0.21'
+gem 'mysql2', '~> 0.4.10'
+
+gem 'chromedriver-helper' if ENV['CI']
 
 group :development, :test do
   gem "pry-rails"
+  gem "ffaker"
 end
 
 gemspec

data/README.md

@@ -1,12 +1,29 @@
 Solidus Gateway
 ===============
-
-Community supported Solidus Payment Method Gateways. It works as a wrapper for
-active_merchant gateway. Note that for some gateways you might still need to
+Community supported Solidus Payment Methods. It works as a wrapper for
+active_merchant gateways. Note that for some gateways you might still need to
 add another gem to your Gemfile to make it work. For example active_merchant
 require `braintree` but it doesn't include that gem on its gemspec. So you
 need to manually add it to your rails app Gemfile.
 
+---
+
+**DEPRECATION NOTICE**
+
+This extension is only ported over to Solidus to continue supporting stores upgrading from Spree.
+
+For **new stores we strongly recommend** using one of these payment provider extensions:
+
+* [`solidus_braintree_paypal`](https://github.com/solidusio/solidus_paypal_braintree) for Braintree provided payment methods like PayPal, Apple Pay and credit cards
+* [`solidus_adyen`](https://github.com/StemboltHQ/solidus-adyen) for Adyen provided payment methods
+* [`solidus_affirm`](https://github.com/StemboltHQ/solidus_affirm) for Affirm provided payment methods
+* [`solidus_klarna_payments`](https://github.com/bitspire/solidus_klarna_payments)
+* [`solidus_paybright`](https://github.com/StemboltHQ/solidus_paybright)
+
+Although we will keep supporting Bug fixes for existing payment methods we **will not accept new payment methods** to be included in this gem.
+
+Please create your own extension for new payment methods. Take one of the above examples as starting point for your extension.
+
 Installation
 ------------
 

data/lib/solidus_gateway.rb

@@ -1,5 +1,6 @@
 require "solidus_core"
 require "solidus_support"
+require "active_merchant"
 require "spree_gateway/engine"
 require "solidus_gateway/version"
 require "sass/rails"

data/lib/solidus_gateway/version.rb

@@ -1,3 +1,3 @@
 module SolidusGateway
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/spree_gateway/engine.rb

@@ -2,8 +2,6 @@ module SpreeGateway
   class Engine < Rails::Engine
     engine_name 'solidus_gateway'
 
-    config.autoload_paths += %W(#{config.root}/lib)
-
     initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
         app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
         app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
@@ -22,7 +20,6 @@ module SpreeGateway
         app.config.spree.payment_methods << Spree::Gateway::UsaEpay
         app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
         app.config.spree.payment_methods << Spree::Gateway::DataCash
-        app.config.spree.payment_methods << Spree::Gateway::UsaEpay
         app.config.spree.payment_methods << Spree::Gateway::PinGateway
         app.config.spree.payment_methods << Spree::Gateway::Paymill
         app.config.spree.payment_methods << Spree::Gateway::PayflowPro
@@ -40,36 +37,17 @@ module SpreeGateway
     initializer "spree.gateway.braintree_gateway.application_id" do |app|
       # NOTE: if the braintree gem is not loaded, calling ActiveMerchant::Billing::BraintreeBlueGateway crashes
       # therefore, check here to see if Braintree exists before trying to call it
-      if defined?(Braintree) 
+      if defined?(Braintree)
         ActiveMerchant::Billing::BraintreeBlueGateway.application_id = "Solidus"
       end
     end
 
-    def self.activate
-      if SpreeGateway::Engine.frontend_available?
-        Rails.application.config.assets.precompile += [
-          'lib/assets/javascripts/spree/frontend/solidus_gateway.js',
-          'lib/assets/javascripts/spree/frontend/solidus_gateway.css',
-        ]
-      end
-    end
-
-    def self.backend_available?
-      @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
-    end
-
-    def self.frontend_available?
-      @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
-    end
-
-    if self.backend_available?
+    if SolidusSupport.backend_available?
       paths["app/views"] << "lib/views/backend"
     end
 
-    if self.frontend_available?
+    if SolidusSupport.frontend_available?
       paths["app/views"] << "lib/views/frontend"
     end
-
-    config.to_prepare &method(:activate).to_proc
   end
 end

data/lib/views/frontend/spree/checkout/existing_payment/_stripe.html.erb

@@ -0,0 +1 @@
+<%= render partial: "spree/checkout/existing_payment/gateway", locals: { wallet_payment_source: wallet_payment_source, default: default } %>

data/solidus_gateway.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.requirements << "none"
 
   s.add_dependency "solidus_core", [">= 1.1", "< 3"]
-  s.add_dependency "solidus_support"
+  s.add_dependency "solidus_support", ">= 0.1.3"
 
   # ActiveMerchant v1.58 through v1.59 introduced a breaking change
   # to the stripe gateway.
@@ -36,11 +36,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.2"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sass-rails"
-  s.add_development_dependency "coffee-rails"
-  s.add_development_dependency "factory_girl", "~> 4.4"
+  s.add_development_dependency "factory_bot", "~> 4.4"
   s.add_development_dependency "capybara"
   s.add_development_dependency "capybara-screenshot"
   s.add_development_dependency "poltergeist", "~> 1.9"
+  s.add_development_dependency "selenium-webdriver"
   s.add_development_dependency "database_cleaner", "~> 1.5"
 end

data/spec/features/stripe_checkout_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 RSpec.describe "Stripe checkout", type: :feature do
   before do
-    FactoryGirl.create(:store)
+    FactoryBot.create(:store)
     # Set up a zone
-    zone = FactoryGirl.create(:zone)
-    country = FactoryGirl.create(:country)
+    zone = FactoryBot.create(:zone)
+    country = FactoryBot.create(:country)
     zone.members << Spree::ZoneMember.create!(zoneable: country)
-    FactoryGirl.create(:free_shipping_method)
+    FactoryBot.create(:free_shipping_method)
 
     Spree::Gateway::StripeGateway.create!(
       name: "Stripe",
@@ -15,7 +15,7 @@ RSpec.describe "Stripe checkout", type: :feature do
       preferred_publishable_key: "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg",
     )
 
-    FactoryGirl.create(:product, name: "DL-44")
+    FactoryBot.create(:product, name: "DL-44")
 
     visit spree.root_path
     click_link "DL-44"
@@ -41,20 +41,20 @@ RSpec.describe "Stripe checkout", type: :feature do
 
     # Delivery
     expect(page).to have_current_path("/checkout/delivery")
+    expect(page).to have_content("UPS Ground")
     click_on "Save and Continue"
+
+    expect(page).to have_current_path("/checkout/payment")
   end
 
   # This will fetch a token from Stripe.com and then pass that to the webserver.
   # The server then processes the payment using that token.
-  it "can process a valid payment (with JS)", js: true do
+  it "can process a valid payment", js: true do
     fill_in "Card Number", with: "4242 4242 4242 4242"
-    # Otherwise ccType field does not get updated correctly
-    page.execute_script("$('.cardNumber').trigger('change')")
     fill_in "Card Code", with: "123"
     fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
     click_button "Save and Continue"
-    sleep(5) # Wait for Stripe API to return + form to submit
-    expect(page.current_url).to include("/checkout/confirm")
+    expect(page).to have_current_path("/checkout/confirm")
     click_button "Place Order"
     expect(page).to have_content("Your order has been processed successfully")
   end

data/spec/models/gateway/stripe_gateway_spec.rb

@@ -161,11 +161,11 @@ describe Spree::Gateway::StripeGateway do
       gateway
     end
 
-    let!(:store) { FactoryGirl.create(:store) }
+    let!(:store) { FactoryBot.create(:store) }
     let(:order) { Spree::Order.create! }
 
     let(:card) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :credit_card,
         gateway_customer_profile_id: 'cus_abcde',
         imported: false

data/spec/spec_helper.rb

@@ -5,51 +5,22 @@ ENV["RAILS_ENV"] ||= "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
-require "rspec/rails"
+require 'solidus_support/extension/feature_helper'
 
-require "capybara/rspec"
-require 'capybara-screenshot/rspec'
-require 'capybara/poltergeist'
-Capybara.register_driver(:poltergeist) do |app|
-  Capybara::Poltergeist::Driver.new app, timeout: 90
-end
-Capybara.javascript_driver = :poltergeist
-Capybara.default_max_wait_time = 10
-
-require "database_cleaner"
-require "braintree"
-require "ffaker"
+require 'selenium-webdriver'
+Capybara.javascript_driver = :selenium_chrome_headless
 
-require "spree/testing_support/factories"
-require "spree/testing_support/order_walkthrough"
+require 'braintree'
 
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-  config.mock_with :rspec
-
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-  config.use_transactional_fixtures = false
-
-  config.include FactoryGirl::Syntax::Methods
 
   config.before :suite do
-    DatabaseCleaner.clean_with :truncation
-
     # Don't log Braintree to STDOUT.
     Braintree::Configuration.logger = Logger.new("spec/dummy/tmp/log")
   end
 
-  config.before do
-    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
-
-  FactoryGirl.find_definitions
+  FactoryBot.find_definitions
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_gateway
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -127,35 +127,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -210,6 +182,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -268,8 +254,6 @@ files:
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
 - db/migrate/20131008221012_update_paypal_payment_method_type.rb
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
-- lib/assets/javascripts/spree/frontend/solidus_gateway.js
-- lib/assets/stylesheets/spree/frontend/solidus_gateway.css
 - lib/generators/solidus_gateway/install/install_generator.rb
 - lib/solidus_gateway.rb
 - lib/solidus_gateway/version.rb
@@ -279,6 +263,7 @@ files:
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
+- lib/views/frontend/spree/checkout/existing_payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - solidus_gateway.gemspec
 - spec/features/stripe_checkout_spec.rb
@@ -326,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Solidus

data/lib/assets/javascripts/spree/frontend/solidus_gateway.js

@@ -1 +0,0 @@
-//= require spree/frontend

data/lib/assets/stylesheets/spree/frontend/solidus_gateway.css

@@ -1,3 +0,0 @@
-/*
- *= require spree/frontend
-*/