solidus_social 1.0.0 → 1.4.0

data/spec/features/spree/sign_in_spec.rb

@@ -1,13 +1,15 @@
-RSpec.feature 'signing in using Omniauth', :js do
+# frozen_string_literal: true
+
+RSpec.describe 'Signing in using Omniauth', :js do
   context 'facebook' do
-    background do
+    before do
       Spree::AuthenticationMethod.create!(
         provider: 'facebook',
         api_key: 'fake',
         api_secret: 'fake',
         environment: Rails.env,
-        active: true)
-      OmniAuth.config.test_mode = true
+        active: true
+      )
       OmniAuth.config.mock_auth[:facebook] = {
         'provider' => 'facebook',
         'uid' => '123545',
@@ -23,36 +25,43 @@ RSpec.feature 'signing in using Omniauth', :js do
       }
     end
 
-    scenario 'going to sign in' do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+    it 'going to sign in' do
+      visit spree.login_path
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
       click_link 'Logout'
       click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
     end
 
     # Regression test for #91
-    scenario "attempting to view 'My Account' works" do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+    it "attempting to view 'My Account' works" do
+      visit spree.login_path
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
       click_link 'My Account'
       expect(page).to have_text 'My Account'
     end
+
+    it "view 'My Account'" do
+      visit spree.login_path
+      click_on 'Login with facebook'
+      expect(page).to have_text 'You are now signed in with your facebook account.'
+      click_link 'My Account'
+      expect(page).not_to have_selector 'div#social-signin-links'
+    end
   end
 
   context 'twitter' do
-    background do
+    before do
       Spree::AuthenticationMethod.create!(
         provider: 'twitter',
         api_key: 'fake',
         api_secret: 'fake',
         environment: Rails.env,
-        active: true)
+        active: true
+      )
       OmniAuth.config.test_mode = true
       OmniAuth.config.mock_auth[:twitter] = {
         'provider' => 'twitter',
@@ -68,10 +77,9 @@ RSpec.feature 'signing in using Omniauth', :js do
       }
     end
 
-    scenario 'going to sign in' do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with twitter"]').trigger('click')
+    it 'going to sign in' do
+      visit spree.login_path
+      click_on 'Login with twitter'
       expect(page).to have_text 'Please confirm your email address to continue'.upcase
       fill_in 'Email', with: 'user@example.com'
       click_button 'Create'

data/spec/lib/solidus_social/engine_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe SolidusSocial::Engine do
+  describe 'USER_DECORATOR_PATH' do
+    it 'is pointing to the correct file' do
+      expect(File.exist? described_class::USER_DECORATOR_PATH).to eq(true)
+    end
+  end
+end

data/spec/lib/solidus_social_speec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe SolidusSocial do
+  describe '.configured_providers' do
+    subject { described_class.configured_providers }
+
+    it { is_expected.to match_array(["amazon", "facebook", "github", "google_oauth2", "twitter"]) }
+  end
+
+  describe '.init_providers' do
+    subject { described_class.init_providers }
+
+    around do |example|
+      previous_providers = Spree::SocialConfig.providers
+      Spree::SocialConfig.providers = { facebook: { api_key: "secret_key", api_secret: "secret_secret" } }
+      example.run
+      Spree::SocialConfig.providers = previous_providers
+    end
+
+    it "sets up Devise for the given providers" do
+      expect(described_class).to receive(:setup_key_for).with(:facebook, "secret_key", "secret_secret")
+      subject
+    end
+  end
+end

data/spec/lib/spree/social_config_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.describe Spree::SocialConfig do
+  it "changing a preference does not create a Spree::Preference" do
+    expect { subject.path_prefix = 'customer' }.not_to change(Spree::Preference, :count)
+  end
+
+  it "holds configuration for the five default providers" do
+    expect(subject.providers.keys).to match_array([:amazon, :facebook, :github, :google_oauth2, :twitter])
+  end
+end

data/spec/models/spree/authentication_method_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe Spree::AuthenticationMethod do
+  describe '.provider_options' do
+    subject { described_class.provider_options }
+
+    let(:expected_provider_options) do
+      [
+        %w(Amazon amazon),
+        %w(Facebook facebook),
+        %w(Twitter twitter),
+        %w(Github github),
+        %w(Google google_oauth2)
+      ]
+    end
+
+    it { is_expected.to match_array(expected_provider_options) }
+  end
+end

data/spec/models/spree/social_configuration_spec.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+RSpec.describe Spree::SocialConfiguration do
+  it { is_expected.to respond_to(:path_prefix) }
+  it { is_expected.to respond_to(:providers) }
+end

data/spec/models/spree/user_decorator_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::User, type: :model do
   let(:user) { create(:user) }
   let(:omni_params) { { 'provider' => 'twitter', 'uid' => 12_345 } }
   let(:auths) { double 'auths' }
 
-  context '.apply_omniauth' do
+  describe '.apply_omniauth' do
     before { allow(user).to receive(:user_authentications).and_return(auths) }
 
     it 'builds an associated auth source' do
@@ -21,9 +23,30 @@ RSpec.describe Spree::User, type: :model do
         expect(user.email).to eq 'test@example.com'
       end
     end
+
+    context 'instance is valid' do
+      let(:user) { create(:user) { |user| user.email = nil } }
+      let(:omni_params) do
+        {
+          'provider' => 'any_provider',
+          'uid' => 12_345,
+          'info' => { 'email' => 'test@example.com' }
+        }
+      end
+
+      before do
+        allow(auths).to receive(:build)
+        allow(auths).to receive(:empty?).and_return(false)
+      end
+
+      it 'builds a valid user' do
+        user.apply_omniauth(omni_params)
+        expect(user).to be_valid
+      end
+    end
   end
 
-  context '.password_required?' do
+  describe '.password_required?' do
     before { user.password = nil }
 
     context 'user authentications is empty' do

data/spec/spec_helper.rb

@@ -1,36 +1,24 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter 'spec'
-  add_group  'Controllers', 'app/controllers'
-  add_group  'Helpers', 'app/helpers'
-  add_group  'Overrides', 'app/overrides'
-  add_group  'Models', 'app/models'
-  add_group  'Libraries', 'lib'
-end
+# frozen_string_literal: true
 
-ENV['RAILS_ENV'] ||= 'test'
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
 
-begin
-  require File.expand_path('../dummy/config/environment', __FILE__)
-rescue LoadError
-  puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'
-  exit
-end
+# Run Coverage report
+require 'solidus_dev_support/rspec/coverage'
+
+require File.expand_path('dummy/config/environment.rb', __dir__)
+
+# Requires factories and other useful helpers defined in spree_core.
+require 'solidus_dev_support/rspec/feature_helper'
 
-require 'rspec/rails'
-require 'ffaker'
-require 'pry'
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories defined in lib/solidus_social/factories.rb
+require 'solidus_social/factories'
 
 RSpec.configure do |config|
-  config.fail_fast = false
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-  config.raise_errors_for_deprecations!
   config.infer_spec_type_from_file_location!
-
-  config.expect_with :rspec do |expectations|
-    expectations.syntax = :expect
-  end
+  config.use_transactional_fixtures = false
 end
-
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |file| require file }

data/spec/support/omniauth.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+OmniAuth.config.test_mode = true
+OmniAuth.config.logger = Rails.logger

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: solidus_social
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - John Dyer
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: oa-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oa-core
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-twitter
+  name: omniauth-amazon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-amazon
+  name: omniauth-twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,69 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: solidus_auth_devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -193,91 +137,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.41.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.41.0
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
-- !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: 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'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -290,66 +184,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
-description: Adds social network login services (OAuth) to Spree
+description:
 email: jdyer@spreecommerce.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".gem_release.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/spree/backend/solidus_social.js
-- app/assets/javascripts/spree/frontend/solidus_social.js
-- app/assets/stylesheets/spree/backend/solidus_social.css
 - app/assets/stylesheets/spree/frontend/fontello.css
 - app/assets/stylesheets/spree/frontend/solidus_social.css
 - app/controllers/spree/admin/authentication_methods_controller.rb
 - app/controllers/spree/omniauth_callbacks_controller.rb
 - app/controllers/spree/user_authentications_controller.rb
-- app/controllers/spree/user_registrations_controller_decorator.rb
+- app/core/spree/permission_sets/authentication_method_display.rb
+- app/core/spree/permission_sets/authentication_method_management.rb
+- app/decorators/controllers/solidus_social/spree/user_registrations_controller_decorator.rb
+- app/decorators/models/solidus_social/spree/user_decorator.rb
 - app/helpers/spree/omniauth_callbacks_helper.rb
 - app/models/spree/authentication_method.rb
 - app/models/spree/social_configuration.rb
 - app/models/spree/user_authentication.rb
-- app/models/spree/user_decorator.rb
 - app/overrides/add_authentications_to_account_summary.rb
 - app/overrides/admin_configuration_decorator.rb
 - app/overrides/user_registrations_decorator.rb
@@ -357,17 +222,21 @@ files:
 - app/views/spree/admin/authentication_methods/edit.html.erb
 - app/views/spree/admin/authentication_methods/index.html.erb
 - app/views/spree/admin/authentication_methods/new.html.erb
-- app/views/spree/admin/shared/_configurations_menu.html.erb
 - app/views/spree/shared/_social.html.erb
 - app/views/spree/shared/_user_form.html.erb
 - app/views/spree/users/_new-customer.html.erb
 - app/views/spree/users/_social.html.erb
+- bin/console
 - bin/rails
-- config/initializers/devise.rb
+- bin/rake
+- bin/sandbox
+- bin/setup
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
+- config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/sv.yml
@@ -375,26 +244,32 @@ files:
 - db/migrate/20120120163432_create_user_authentications.rb
 - db/migrate/20120123163222_create_authentication_methods.rb
 - lib/generators/solidus_social/install/install_generator.rb
+- lib/generators/solidus_social/install/templates/config/initializers/solidus_social.rb
 - lib/solidus_social.rb
 - lib/solidus_social/engine.rb
+- lib/solidus_social/facebook_omniauth_strategy_ext.rb
+- lib/solidus_social/factories.rb
 - lib/solidus_social/version.rb
 - solidus_social.gemspec
 - spec/controllers/spree/omniauth_callbacks_controller_spec.rb
 - spec/features/spree/admin/authentication_methods_configuration_spec.rb
 - spec/features/spree/sign_in_spec.rb
-- spec/lib/spree_social/engine_spec.rb
+- spec/lib/solidus_social/engine_spec.rb
+- spec/lib/solidus_social_speec.rb
+- spec/lib/spree/social_config_spec.rb
+- spec/models/spree/authentication_method_spec.rb
+- spec/models/spree/social_configuration_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/database_cleaner.rb
-- spec/support/devise.rb
-- spec/support/factory_girl.rb
-- spec/support/spree.rb
-homepage: http://www.spreecommerce.com
+- spec/support/omniauth.rb
+homepage: https://github.com/solidusio-contrib/solidus_social#readme
 licenses:
-- BSD-3
-metadata: {}
-post_install_message: 
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://github.com/solidusio-contrib/solidus_social#readme
+  source_code_uri: https://github.com/solidusio-contrib/solidus_social
+  changelog_uri: https://github.com/solidusio-contrib/solidus_social/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -402,28 +277,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+requirements: []
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: Adds social network login services (OAuth) to Spree
+summary: Adds social network login services (OAuth) to Solidus
 test_files:
 - spec/controllers/spree/omniauth_callbacks_controller_spec.rb
 - spec/features/spree/admin/authentication_methods_configuration_spec.rb
 - spec/features/spree/sign_in_spec.rb
-- spec/lib/spree_social/engine_spec.rb
+- spec/lib/solidus_social/engine_spec.rb
+- spec/lib/solidus_social_speec.rb
+- spec/lib/spree/social_config_spec.rb
+- spec/models/spree/authentication_method_spec.rb
+- spec/models/spree/social_configuration_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/database_cleaner.rb
-- spec/support/devise.rb
-- spec/support/factory_girl.rb
-- spec/support/spree.rb
+- spec/support/omniauth.rb