-
- <%= f.label :variant_id, Spree.t(:value) %>
- *
-
- <%= f.label :note, Spree.t("note") %>
+
+
+
- <%= f.submit Spree.t(:add_to_cart), class: 'btn btn-lg btn-success btn-block' %>
+ <%= Spree.t(:gift_cards) %>
+
+ <%= render "spree/shared/error_messages", target: @gift_card %>
+
+ <%= form_for @gift_card do |f| %>
+ <%= render partial: 'form', locals: { f: f } %>
+ <% end %>
+
+ <%= render partial: 'spree/shared/error_messages', locals: { target: @gift_card } %>
- <% end %>
-
+
+
diff --git a/app/views/spree/order_mailer/gift_card_email.html.erb b/app/views/spree/order_mailer/gift_card_receiver.html.erb
similarity index 56%
rename from app/views/spree/order_mailer/gift_card_email.html.erb
rename to app/views/spree/order_mailer/gift_card_receiver.html.erb
index 8aab40f..8770eb9 100644
--- a/app/views/spree/order_mailer/gift_card_email.html.erb
+++ b/app/views/spree/order_mailer/gift_card_receiver.html.erb
@@ -5,30 +5,21 @@
You may want to print a copy of this message for easy reference later.
- <% if @gift_card.variant.images.present? %>
- <%= image_tag @gift_card.variant.images.first.attachment.url(:product), style: 'width: 240px; height: auto' %>
Gift Card Amount:
- <%= number_to_currency @gift_card.price %>
+ <%= @gift_card.display_gift_card_price(@gift_card.price) %>
Gift Code:
<%= @gift_card.code %>
- <% if Spree::Config.allow_gift_card_redeem %>
-
- Claim Code:
- <%= link_to 'Click here', redeem_gift_card_url(@gift_card.code) %>
-
- <% end %>
Senders Note:
<%= @gift_card.note %>
Sent By:
- <%= @order.email %>
+ <%= @gift_card&.sender_email %>
diff --git a/app/views/spree/order_mailer/gift_card_sender.html.erb b/app/views/spree/order_mailer/gift_card_sender.html.erb
new file mode 100644
index 0000000..4b66592
--- /dev/null
+++ b/app/views/spree/order_mailer/gift_card_sender.html.erb
@@ -0,0 +1,7 @@
+
Hi <%= @gift_card&.sender_name %>,
+
+ It is to notify you that your this Gift Card to <%= "#{@gift_card.name}" %> has been delivered.
+
+
+
Best Regards
+
<%= Spree::Store.current.name %>
diff --git a/app/views/spree/orders/_line_item.html.erb b/app/views/spree/orders/_line_item.html.erb
new file mode 100644
index 0000000..03679b2
--- /dev/null
+++ b/app/views/spree/orders/_line_item.html.erb
@@ -0,0 +1,31 @@
+<% variant = line_item.variant %>
+
+<%= order_form.fields_for :line_items, line_item do |item_form| %>
+
+<% end %>
diff --git a/app/views/spree/orders/_line_item_data.html.erb b/app/views/spree/orders/_line_item_data.html.erb
new file mode 100644
index 0000000..e548e80
--- /dev/null
+++ b/app/views/spree/orders/_line_item_data.html.erb
@@ -0,0 +1,42 @@
+<% if view == "mobile" %>
+ <% additional_classes = "d-lg-none" %>
+<% elsif view == "desktop" %>
+ <% additional_classes = "d-none d-lg-table-cell" %>
+<% end %>
+
+
+ <%= line_item.single_money.to_html %>
+
+
+<% if line_item.gift_card.present? %>
+
+ <%= button_tag '-', type: 'button', class: "d-none border-right-0 shopping-cart-item-quantity-decrease-btn", data: { id: dom_id(line_item) } %>
+ <%= item_form.number_field :quantity, min: 0, class: " d-none form-control text-center border-left-0 border-right-0 shopping-cart-item-quantity-input", size: 5, data: { id: dom_id(line_item) } %>
+ <%= button_tag '+', type: 'button', class: "d-none border-left-0 shopping-cart-item-quantity-increase-btn", data: { id: dom_id(line_item) } %>
+
+<% end %>
+
+
+
+<% if view == "desktop" %>
+
+ <%= line_item.display_amount.to_html unless line_item.quantity.nil? %>
+
+<% end %>
+
+
+ <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbo: false, id: dom_id(line_item), variant_sku: line_item.sku, variant_name: line_item.name, variant_price: line_item.price, variant_options: line_item.options_text }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
+ <%= icon(name: 'garbage',
+ classes: 'shopping-cart-item-delete-icon',
+ width: 18.9,
+ height: 17) %>
+ <% end %>
+
diff --git a/config/initializers/gift_card.rb b/config/initializers/gift_card.rb
new file mode 100644
index 0000000..5018908
--- /dev/null
+++ b/config/initializers/gift_card.rb
@@ -0,0 +1,14 @@
+Rails.application.config.after_initialize do
+ if Spree::Core::Engine.backend_available?
+ Rails.application.config.spree_backend.main_menu.add(
+ ::Spree::Admin::MainMenu::ItemBuilder.new(
+ 'gift_cards',
+ ::Spree::Core::Engine.routes.url_helpers.admin_gift_cards_path
+ )
+ .with_icon_key('gift.svg')
+ .with_manage_ability_check(::Spree::GiftCard)
+ .with_match_path('/gift-card')
+ .build
+ )
+ end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4a5ad66..026adf4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,3 +42,5 @@ en:
successfully_created_gift_card: 'You have successfully created the gift card.'
transactions: "Transactions"
value: 'Value'
+ gift_card_email_resent: Gift card email resent
+ gift_card_order_not_found: Gift card order not found
diff --git a/config/routes.rb b/config/routes.rb
index 0c66402..90ff31e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
Spree::Core::Engine.routes.draw do
resources :gift_cards do
member do
@@ -15,6 +17,9 @@
namespace :admin do
resources :gift_cards do
+ member do
+ post :resend
+ end
collection do
get 'new-classic' => 'gift_cards#new', as: 'gift-card-new'
get 'new-digital' => 'gift_cards#new', as: 'e-gift-card-new'
diff --git a/db/migrate/20101008115306_add_gift_card_attr_to_spree_products.rb b/db/migrate/20101008115306_add_gift_card_attr_to_spree_products.rb
index a35f188..54c8bc9 100644
--- a/db/migrate/20101008115306_add_gift_card_attr_to_spree_products.rb
+++ b/db/migrate/20101008115306_add_gift_card_attr_to_spree_products.rb
@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
class AddGiftCardAttrToSpreeProducts < ActiveRecord::Migration[4.2]
def change
- add_column :spree_products, :is_gift_card, :boolean, :default => false, :null => false
- add_column :spree_products, :is_e_gift_card, :boolean, default: false, null: false
+ add_column :spree_products, :is_gift_card, :boolean, default: false, null: false unless column_exists?(
+ :spree_products, :is_gift_card
+ )
+ add_column :spree_products, :is_e_gift_card, :boolean, default: false, null: false unless column_exists?(
+ :spree_products, :is_e_gift_card
+ )
end
end
diff --git a/db/migrate/20101011103850_create_spree_gift_cards.rb b/db/migrate/20101011103850_create_spree_gift_cards.rb
index b0c8e10..722e084 100644
--- a/db/migrate/20101011103850_create_spree_gift_cards.rb
+++ b/db/migrate/20101011103850_create_spree_gift_cards.rb
@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
class CreateSpreeGiftCards < ActiveRecord::Migration[4.2]
def change
create_table :spree_gift_cards do |t|
- t.integer :variant_id, :null => false
+ t.integer :variant_id, null: false
t.integer :line_item_id
t.string :email
t.string :name
t.string :sender_email
t.string :sender_name
t.text :note
- t.string :code, :null => false
+ t.string :code, null: false
t.datetime :sent_at
t.datetime :delivery_on
- t.decimal :current_value, :precision => 8, :scale => 2, :null => false
- t.decimal :original_value, :precision => 8, :scale => 2, :null => false
+ t.decimal :current_value, precision: 8, scale: 2, null: false
+ t.decimal :original_value, precision: 8, scale: 2, null: false
t.timestamps
end
end
diff --git a/db/migrate/20121017183422_create_spree_gift_card_transactions.rb b/db/migrate/20121017183422_create_spree_gift_card_transactions.rb
index c876706..07fd686 100644
--- a/db/migrate/20121017183422_create_spree_gift_card_transactions.rb
+++ b/db/migrate/20121017183422_create_spree_gift_card_transactions.rb
@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
class CreateSpreeGiftCardTransactions < ActiveRecord::Migration[4.2]
def change
- create_table :spree_gift_card_transactions do |t|
- t.decimal :amount, scale: 2, precision: 6
- t.belongs_to :gift_card
- t.belongs_to :order
- t.timestamps
+ unless table_exists? :spree_gift_card_transactions
+ create_table :spree_gift_card_transactions do |t|
+ t.decimal :amount, scale: 2, precision: 6
+ t.belongs_to :gift_card
+ t.belongs_to :order
+ t.timestamps
+ end
end
end
end
diff --git a/db/migrate/2013080702300_upgrade_gift_card_adjustments.rb b/db/migrate/2013080702300_upgrade_gift_card_adjustments.rb
index a6c8d74..2d2d499 100644
--- a/db/migrate/2013080702300_upgrade_gift_card_adjustments.rb
+++ b/db/migrate/2013080702300_upgrade_gift_card_adjustments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpgradeGiftCardAdjustments < ActiveRecord::Migration[4.2]
def up
if ActiveRecord::Base.connection.column_exists?(:spree_adjustments, :originator_type)
@@ -8,7 +10,7 @@ def up
end
# Gift Card adjustments have their sources altered
- Spree::Adjustment.where(:originator_type => "Spree::GiftCard").find_each do |adjustment|
+ Spree::Adjustment.where(originator_type: "Spree::GiftCard").find_each do |adjustment|
adjustment.source = adjustment.originator
adjustment.save
end
diff --git a/db/migrate/20161012071043_add_action_and_authorization_code_to_spree_gift_card_transaction.rb b/db/migrate/20161012071043_add_action_and_authorization_code_to_spree_gift_card_transaction.rb
index 52ef3be..99d203d 100644
--- a/db/migrate/20161012071043_add_action_and_authorization_code_to_spree_gift_card_transaction.rb
+++ b/db/migrate/20161012071043_add_action_and_authorization_code_to_spree_gift_card_transaction.rb
@@ -1,6 +1,11 @@
+# frozen_string_literal: true
+
class AddActionAndAuthorizationCodeToSpreeGiftCardTransaction < ActiveRecord::Migration[4.2]
def change
- add_column :spree_gift_card_transactions, :action, :string
- add_column :spree_gift_card_transactions, :authorization_code, :string
+ add_column :spree_gift_card_transactions, :action, :string unless column_exists?(:spree_gift_card_transactions,
+ :action)
+ add_column :spree_gift_card_transactions, :authorization_code, :string unless column_exists?(
+ :spree_gift_card_transactions, :authorization_code
+ )
end
end
diff --git a/db/migrate/20161012102321_add_authorized_amount_to_spree_gift_card.rb b/db/migrate/20161012102321_add_authorized_amount_to_spree_gift_card.rb
index b737596..ecd3669 100644
--- a/db/migrate/20161012102321_add_authorized_amount_to_spree_gift_card.rb
+++ b/db/migrate/20161012102321_add_authorized_amount_to_spree_gift_card.rb
@@ -1,5 +1,12 @@
+# frozen_string_literal: true
+
class AddAuthorizedAmountToSpreeGiftCard < ActiveRecord::Migration[4.2]
def change
- add_column :spree_gift_cards, :authorized_amount, :decimal, precision: 8, scale: 2, null: false, default: 0.0
+ unless column_exists?(
+ :spree_gift_cards, :authorized_amount
+ )
+ add_column :spree_gift_cards, :authorized_amount, :decimal, precision: 8, scale: 2, null: false,
+ default: 0.0
+ end
end
end
diff --git a/db/migrate/20180103131710_create_spree_user_gift_cards.rb b/db/migrate/20180103131710_create_spree_user_gift_cards.rb
index 5cd3ec0..a80ee60 100644
--- a/db/migrate/20180103131710_create_spree_user_gift_cards.rb
+++ b/db/migrate/20180103131710_create_spree_user_gift_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateSpreeUserGiftCards < ActiveRecord::Migration[4.2]
def change
create_table :spree_user_gift_cards do |t|
diff --git a/db/migrate/20220610074522_spree_gift_card_notification.rb b/db/migrate/20220610074522_spree_gift_card_notification.rb
new file mode 100644
index 0000000..6294450
--- /dev/null
+++ b/db/migrate/20220610074522_spree_gift_card_notification.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class SpreeGiftCardNotification < ActiveRecord::Migration[6.0]
+ def change
+ add_column :spree_orders, :gift_card_notified, :boolean, default: false
+ add_column :spree_gift_cards, :gift_card_notified, :boolean, default: false
+ end
+end
diff --git a/db/migrate/20220718063447_add_state_to_gift_card.rb b/db/migrate/20220718063447_add_state_to_gift_card.rb
new file mode 100644
index 0000000..7d51dfd
--- /dev/null
+++ b/db/migrate/20220718063447_add_state_to_gift_card.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStateToGiftCard < ActiveRecord::Migration[6.0]
+ def change
+ add_column :spree_gift_cards, :state, :string
+ end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 8fafafa..f40a2fd 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,8 +1,11 @@
-if Spree::Product.gift_cards.count == 0
+# frozen_string_literal: true
+
+if Spree::Product.gift_cards.count.zero?
puts "\tCreating default gift card..."
shipping_category = Spree::ShippingCategory.create(name: 'Gift Card')
- product = Spree::Product.new(available_on: Time.now, name: "Gift Card", is_gift_card: true, slug: 'gift-card', price: 0, shipping_category_id: shipping_category.id)
- option_type = Spree::OptionType.new(name: "is-gift-card", presentation: "Value")
+ product = Spree::Product.new(available_on: Time.now, name: 'Gift Card', is_gift_card: true, slug: 'gift-card',
+ price: 0, shipping_category_id: shipping_category.id)
+ option_type = Spree::OptionType.new(name: 'is-gift-card', presentation: 'Value')
product.option_types << option_type
[25, 50, 75, 100].each do |value|
option_value = Spree::OptionValue.new(name: value, presentation: "$#{value}")
@@ -17,8 +20,8 @@
end
unless Spree::PaymentMethod::GiftCard.all.exists?
Spree::PaymentMethod::GiftCard.create(
- name: "Gift Card",
- description: "Pay by Gift Card",
+ name: 'Gift Card',
+ description: 'Pay by Gift Card',
active: true,
display_on: :both
)
diff --git a/lib/generators/spree_gift_card/install_generator.rb b/lib/generators/spree_gift_card/install_generator.rb
index 9445358..ff43575 100644
--- a/lib/generators/spree_gift_card/install_generator.rb
+++ b/lib/generators/spree_gift_card/install_generator.rb
@@ -1,22 +1,18 @@
+# frozen_string_literal: true
+
module SpreeGiftCard
module Generators
class InstallGenerator < Rails::Generators::Base
-
def add_javascripts
- append_file "vendor/assets/javascripts/spree/frontend/all.js", "//= require spree/frontend/spree_gift_card\n"
- append_file "vendor/assets/javascripts/spree/backend/all.js", "//= require spree/backend/spree_gift_card\n"
+ append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_gift_card\n"
+ append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_gift_card\n"
end
def add_stylesheets
- inject_into_file "vendor/assets/stylesheets/spree/frontend/all.css", " *= require spree/frontend/spree_gift_card\n", :before => /\*\//, :verbose => true
- inject_into_file "vendor/assets/stylesheets/spree/backend/all.css", " *= require spree/backend/spree_gift_card\n", :before => /\*\//, :verbose => true
- end
-
- def add_schedule
- create_file 'config/schedule.rb' unless File.exist?('config/schedule.rb')
- append_file 'config/schedule.rb' do
- "\nevery 1.day, at: '9:00 am' do\n runner 'SpreeGiftCard::SentEmailJob.perform_later'\nend\n"
- end
+ inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css',
+ " *= require spree/frontend/spree_gift_card\n", before: %r{\*/}, verbose: true
+ inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css',
+ " *= require spree/backend/spree_gift_card\n", before: %r{\*/}, verbose: true
end
def add_migrations
@@ -24,14 +20,13 @@ def add_migrations
end
def run_migrations
- res = ask "Would you like to run the migrations now? [Y/n]"
- if res == "" || res.downcase == "y"
+ res = ask 'Would you like to run the migrations now? [Y/n]'
+ if res == '' || res.downcase == 'y'
run 'rake db:migrate'
else
puts "Skipping rake db:migrate, don't forget to run it!"
end
end
-
end
end
end
diff --git a/lib/generators/spree_gift_card/seed_generator.rb b/lib/generators/spree_gift_card/seed_generator.rb
index b199f36..f48c837 100644
--- a/lib/generators/spree_gift_card/seed_generator.rb
+++ b/lib/generators/spree_gift_card/seed_generator.rb
@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
module SpreeGiftCard
module Generators
class SeedGenerator < Rails::Generators::Base
- source_root File.expand_path("../../templates", __FILE__)
+ source_root File.expand_path('../templates', __dir__)
- desc "Create demo gift card"
+ desc 'Create demo gift card'
def run_db_seeds
- seed_file = File.join(File.expand_path("../../../../db", __FILE__), "seeds.rb")
+ seed_file = File.join(File.expand_path('../../../db', __dir__), 'seeds.rb')
load(seed_file) if File.exist?(seed_file)
end
end
diff --git a/lib/spree_gift_card.rb b/lib/spree_gift_card.rb
index 6a02bce..456bdc8 100644
--- a/lib/spree_gift_card.rb
+++ b/lib/spree_gift_card.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'spree_api'
require 'spree_backend'
require 'spree_core'
diff --git a/lib/spree_gift_card/engine.rb b/lib/spree_gift_card/engine.rb
index 84e3736..0f5f010 100644
--- a/lib/spree_gift_card/engine.rb
+++ b/lib/spree_gift_card/engine.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
module SpreeGiftCard
class Engine < Rails::Engine
require 'spree/core'
isolate_namespace Spree
engine_name 'spree_gift_card'
- config.autoload_paths += %W(#{config.root}/lib)
+ config.autoload_paths += %W[#{config.root}/lib]
# use rspec for tests
config.generators do |g|
@@ -12,22 +14,28 @@ class Engine < Rails::Engine
end
def self.activate
- Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+ Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')).sort.each do |c|
Rails.configuration.cache_classes ? require(c) : load(c)
end
- Dir.glob(File.join(File.dirname(__FILE__), "../../app/models/spree/calculator/*.rb")) do |c|
+ Dir.glob(File.join(File.dirname(__FILE__), '../../app/models/spree/calculator/*.rb')).sort.each do |c|
Rails.env.production? ? require(c) : load(c)
end
end
- initializer "spree.register.payment_methods" do |app|
- app.config.spree.payment_methods << Spree::PaymentMethod::GiftCard
+ config.after_initialize do |app|
+ app.config.spree.payment_methods << ::Spree::PaymentMethod::GiftCard
end
- initializer "spree.gift_card.permit_params" do |app|
+ initializer 'spree.gift_card.permit_params' do |_app|
Spree::PermittedAttributes.source_attributes << :code
end
- config.to_prepare &method(:activate).to_proc
+ initializer "spree.gift_card.add_preferences" do
+ Spree::Core::Configuration.class_eval do
+ preference :allow_gift_card_redeem, :boolean, default: true
+ end
+ end
+
+ config.to_prepare(&method(:activate).to_proc)
end
end
diff --git a/lib/tasks/spree_gift_card.rake b/lib/tasks/spree_gift_card.rake
index 2bc30d4..8e8e844 100644
--- a/lib/tasks/spree_gift_card.rake
+++ b/lib/tasks/spree_gift_card.rake
@@ -1,13 +1,6 @@
-namespace :spree do
- namespace :gift_card do
- desc 'Send GiftCard Emails'
- task send_emails: :environment do
- SpreeGiftCard::SendEmailJob.perform_now
- end
-
- desc 'Schedule: Send GiftCard Emails'
- task schedule_send_emails: :environment do
- SpreeGiftCard::SendEmailJob.perform_later
- end
+namespace :gift_cards do
+ desc 'Sends outstanding gift card emails'
+ task send: :environment do
+ ::SpreeGiftCard::SendEmailJob.perform_now
end
end
diff --git a/spec/factories/gift_cards.rb b/spec/factories/gift_cards.rb
index 33ca227..5c79307 100644
--- a/spec/factories/gift_cards.rb
+++ b/spec/factories/gift_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
FactoryGirl.define do
factory :gift_card, class: Spree::GiftCard do
email 'spree@example.com'
@@ -7,9 +9,9 @@
end
factory :gift_card_payment_method, class: Spree::PaymentMethod::GiftCard do
- type "Spree::PaymentMethod::GiftCard"
- name "Gift Card"
- description "Gift Card"
+ type 'Spree::PaymentMethod::GiftCard'
+ name 'Gift Card'
+ description 'Gift Card'
active true
auto_capture false
end
@@ -20,7 +22,7 @@
end
factory :gift_card_store_credit_category, class: Spree::StoreCreditCategory, parent: :store_credit_category do
- name "Gift Card"
+ name 'Gift Card'
end
factory :gift_card_transaction, class: Spree::GiftCardTransaction do
diff --git a/spec/features/add_to_card_spec.rb b/spec/features/add_to_card_spec.rb
index 5929182..11ffa94 100644
--- a/spec/features/add_to_card_spec.rb
+++ b/spec/features/add_to_card_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
require 'spec_helper'
-describe "Add to Cart", js: true do
+describe 'Add to Cart', js: true do
let(:product) { create :product, is_gift_card: true }
let!(:variant) { create :variant, product: product }
@@ -17,7 +19,6 @@
end
it 'contains number of items' do
- expect(page).to have_content("(1)")
+ expect(page).to have_content('(1)')
end
-
end
diff --git a/spec/features/admin/gift_card_administration_spec.rb b/spec/features/admin/gift_card_administration_spec.rb
index 0cf95ac..0487998 100644
--- a/spec/features/admin/gift_card_administration_spec.rb
+++ b/spec/features/admin/gift_card_administration_spec.rb
@@ -1,13 +1,15 @@
-require 'spec_helper'
+# frozen_string_literal: true
-feature "Admin Gift Card Administration", js: true do
+require 'spec_helper'
+feature 'Admin Gift Card Administration', js: true do
stub_authorization!
before do
## TODO seed helper for gc
- product = Spree::Product.new(available_on: Time.now, name: "Gift Card", is_gift_card: true, slug: 'gift-card', price: 0, shipping_category_id: create(:shipping_category).id)
- option_type = Spree::OptionType.new(name: "is-gift-card", presentation: "Value")
+ product = Spree::Product.new(available_on: Time.now, name: 'Gift Card', is_gift_card: true, slug: 'gift-card',
+ price: 0, shipping_category_id: create(:shipping_category).id)
+ option_type = Spree::OptionType.new(name: 'is-gift-card', presentation: 'Value')
product.option_types << option_type
[25, 50, 75, 100].each do |value|
option_value = Spree::OptionValue.new(name: value, presentation: "$#{value}")
@@ -68,10 +70,9 @@
fill_in 'gift_card[name]', with: 'First Last'
fill_in 'gift_card[note]', with: 'Test message.'
click_button 'Update'
- expect(page).to have_content("Gift card \"First Last\" has been successfully updated!")
+ expect(page).to have_content('Gift card "First Last" has been successfully updated!')
within 'table.index' do
expect(page).to have_content('First Last')
end
end
-
end
diff --git a/spec/features/checkout_spec.rb b/spec/features/checkout_spec.rb
index 727fd78..cc912ec 100644
--- a/spec/features/checkout_spec.rb
+++ b/spec/features/checkout_spec.rb
@@ -1,128 +1,128 @@
-require 'spec_helper'
+# frozen_string_literal: true
-describe "Checkout", js: true do
+require 'spec_helper'
- let!(:country) { create(:country, :name => "United States of America",:states_required => true) }
- let!(:state) { create(:state, :name => "Alabama", :country => country) }
+describe 'Checkout', js: true do
+ let!(:country) { create(:country, name: 'United States of America', states_required: true) }
+ let!(:state) { create(:state, name: 'Alabama', country: country) }
let!(:shipping_method) { create(:shipping_method) }
let!(:stock_location) { create(:stock_location) }
- let!(:mug) { create(:product, :name => "RoR Mug") }
+ let!(:mug) { create(:product, name: 'RoR Mug') }
let!(:payment_method) { create(:gift_card_payment_method) }
let!(:payment_method2) { create(:check_payment_method) }
let!(:zone) { create(:zone) }
before do
- create(:gift_card, code: "foobar", variant: create(:variant, price: 5))
+ create(:gift_card, code: 'foobar', variant: create(:variant, price: 5))
end
- context "visitor makes checkout as guest without registration" do
-
- it "informs about an invalid gift code" do
+ context 'visitor makes checkout as guest without registration' do
+ it 'informs about an invalid gift code' do
visit spree.root_path
- click_link "RoR Mug"
- click_button "add-to-cart-button"
+ click_link 'RoR Mug'
+ click_button 'add-to-cart-button'
- # TODO not sure why registration page is ignored so just update order here.
- Spree::Order.last.update_column(:email, "spree@example.com")
- click_button "Checkout"
+ # TODO: not sure why registration page is ignored so just update order here.
+ Spree::Order.last.update_column(:email, 'spree@example.com')
+ click_button 'Checkout'
# fill_in "order_email", :with => "spree@example.com"
# click_button "Continue"
within '#billing' do
- fill_in "First Name", :with => "John"
- fill_in "Last Name", :with => "Smith"
- fill_in "order_bill_address_attributes_address1", :with => "1 John Street"
- fill_in "City", :with => "City of John"
- fill_in "Zip", :with => "01337"
- select "United States of America", :from => "Country"
- select "Alabama", :from => "order[bill_address_attributes][state_id]"
- fill_in "Phone", :with => "555-555-5555"
+ fill_in 'First Name', with: 'John'
+ fill_in 'Last Name', with: 'Smith'
+ fill_in 'order_bill_address_attributes_address1', with: '1 John Street'
+ fill_in 'City', with: 'City of John'
+ fill_in 'Zip', with: '01337'
+ select 'United States of America', from: 'Country'
+ select 'Alabama', from: 'order[bill_address_attributes][state_id]'
+ fill_in 'Phone', with: '555-555-5555'
end
- check "Use Billing Address"
+ check 'Use Billing Address'
# To shipping method screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
# To payment screen
- click_button "Save and Continue"
- fill_in "Gift Code", :with => "coupon_codes_rule_man"
- click_button "Save and Continue"
+ click_button 'Save and Continue'
+ fill_in 'Gift Code', with: 'coupon_codes_rule_man'
+ click_button 'Save and Continue'
expect(page).to have_content("The gift code you entered doesn't exist. Please try again.")
end
- context "when part payment" do
- it "displays valid gift card payment on payment page" do
+ context 'when part payment' do
+ it 'displays valid gift card payment on payment page' do
visit spree.root_path
- click_link "RoR Mug"
- click_button "add-to-cart-button"
+ click_link 'RoR Mug'
+ click_button 'add-to-cart-button'
- # TODO not sure why registration page is ignored so just update order here.
- Spree::Order.last.update_column(:email, "spree@example.com")
- click_button "Checkout"
+ # TODO: not sure why registration page is ignored so just update order here.
+ Spree::Order.last.update_column(:email, 'spree@example.com')
+ click_button 'Checkout'
# fill_in "order_email", :with => "spree@example.com"
# click_button "Continue"
within '#billing' do
- fill_in "First Name", :with => "John"
- fill_in "Last Name", :with => "Smith"
- fill_in "order_bill_address_attributes_address1", :with => "1 John Street"
- fill_in "City", :with => "City of John"
- fill_in "Zip", :with => "01337"
- select "United States of America", :from => "Country"
- select "Alabama", :from => "order[bill_address_attributes][state_id]"
- fill_in "Phone", :with => "555-555-5555"
+ fill_in 'First Name', with: 'John'
+ fill_in 'Last Name', with: 'Smith'
+ fill_in 'order_bill_address_attributes_address1', with: '1 John Street'
+ fill_in 'City', with: 'City of John'
+ fill_in 'Zip', with: '01337'
+ select 'United States of America', from: 'Country'
+ select 'Alabama', from: 'order[bill_address_attributes][state_id]'
+ fill_in 'Phone', with: '555-555-5555'
end
- check "Use Billing Address"
+ check 'Use Billing Address'
# To shipping method screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
# To payment screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
- fill_in "Gift Code", :with => "foobar"
- click_button "Save and Continue"
+ fill_in 'Gift Code', with: 'foobar'
+ click_button 'Save and Continue'
within '#summary-gift-card' do
- expect(page).to have_content("-$5.00")
+ expect(page).to have_content('-$5.00')
end
end
end
- context "when full payment" do
- let!(:mug) { create(:product, :name => "RoR Mug", price: 5.0) }
+ context 'when full payment' do
+ let!(:mug) { create(:product, name: 'RoR Mug', price: 5.0) }
- it "displays valid gift card payment on confirm page" do
+ it 'displays valid gift card payment on confirm page' do
visit spree.root_path
- click_link "RoR Mug"
- click_button "add-to-cart-button"
+ click_link 'RoR Mug'
+ click_button 'add-to-cart-button'
- # TODO not sure why registration page is ignored so just update order here.
- Spree::Order.last.update_column(:email, "spree@example.com")
- click_button "Checkout"
+ # TODO: not sure why registration page is ignored so just update order here.
+ Spree::Order.last.update_column(:email, 'spree@example.com')
+ click_button 'Checkout'
# fill_in "order_email", :with => "spree@example.com"
# click_button "Continue"
within '#billing' do
- fill_in "First Name", :with => "John"
- fill_in "Last Name", :with => "Smith"
- fill_in "order_bill_address_attributes_address1", :with => "1 John Street"
- fill_in "City", :with => "City of John"
- fill_in "Zip", :with => "01337"
- select "United States of America", :from => "Country"
- select "Alabama", :from => "order[bill_address_attributes][state_id]"
- fill_in "Phone", :with => "555-555-5555"
+ fill_in 'First Name', with: 'John'
+ fill_in 'Last Name', with: 'Smith'
+ fill_in 'order_bill_address_attributes_address1', with: '1 John Street'
+ fill_in 'City', with: 'City of John'
+ fill_in 'Zip', with: '01337'
+ select 'United States of America', from: 'Country'
+ select 'Alabama', from: 'order[bill_address_attributes][state_id]'
+ fill_in 'Phone', with: '555-555-5555'
end
- check "Use Billing Address"
+ check 'Use Billing Address'
# To shipping method screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
# To payment screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
- fill_in "Gift Code", :with => "foobar"
- click_button "Save and Continue"
+ fill_in 'Gift Code', with: 'foobar'
+ click_button 'Save and Continue'
within '[data-hook="order-payment"]' do
- expect(page).to have_content("Gift Card ($5.00)")
+ expect(page).to have_content('Gift Card ($5.00)')
end
end
end
diff --git a/spec/features/purchase_spec.rb b/spec/features/purchase_spec.rb
index ecb2e01..a030327 100644
--- a/spec/features/purchase_spec.rb
+++ b/spec/features/purchase_spec.rb
@@ -1,19 +1,21 @@
-require 'spec_helper'
+# frozen_string_literal: true
-feature "Purchase Gift Card", js: true do
+require 'spec_helper'
- let!(:country) { create(:country, :name => "United States of America",:states_required => true) }
- let!(:state) { create(:state, :name => "Alabama", :country => country) }
+feature 'Purchase Gift Card', js: true do
+ let!(:country) { create(:country, name: 'United States of America', states_required: true) }
+ let!(:state) { create(:state, name: 'Alabama', country: country) }
let!(:shipping_method) { create(:shipping_method) }
let!(:stock_location) { create(:stock_location) }
- let!(:mug) { create(:product, :name => "RoR Mug") }
+ let!(:mug) { create(:product, name: 'RoR Mug') }
let!(:payment_method) { create(:check_payment_method) }
let!(:zone) { create(:zone) }
before do
## TODO seed helper for gc
- product = Spree::Product.new(available_on: Time.now, name: "Gift Card", is_gift_card: true, slug: 'gift-card', price: 0, shipping_category_id: shipping_method.shipping_categories.first.id)
- option_type = Spree::OptionType.new(name: "is-gift-card", presentation: "Value")
+ product = Spree::Product.new(available_on: Time.now, name: 'Gift Card', is_gift_card: true, slug: 'gift-card',
+ price: 0, shipping_category_id: shipping_method.shipping_categories.first.id)
+ option_type = Spree::OptionType.new(name: 'is-gift-card', presentation: 'Value')
product.option_types << option_type
[25, 50, 75, 100].each do |value|
option_value = Spree::OptionValue.new(name: value, presentation: "$#{value}")
@@ -27,10 +29,10 @@
expect(Spree::GiftCard.count).to eql(0)
ActionMailer::Base.deliveries = []
visit spree.root_path
- click_link "Buy gift card"
+ click_link 'Buy gift card'
@message_delivery = double(ActionMailer::MessageDelivery)
- @delivery_job = double(ActionMailer::DeliveryJob)
+ @delivery_job = double(ActionMailer::DeliveryJob)
allow(Spree::OrderMailer).to receive(:confirm_email).and_return(@message_delivery)
allow(@message_delivery).to receive(:deliver_later).and_return(@delivery_job)
end
@@ -57,30 +59,30 @@
expect(Spree::GiftCard.count).to eql(1)
end
- # TODO not sure why registration page is ignored so just update order here.
- Spree::Order.last.update_column(:email, "spree@example.com")
- click_button "Checkout"
+ # TODO: not sure why registration page is ignored so just update order here.
+ Spree::Order.last.update_column(:email, 'spree@example.com')
+ click_button 'Checkout'
# fill_in "order_email", :with => "spree@example.com"
# click_button "Continue"
within '#billing' do
- fill_in "First Name", :with => "John"
- fill_in "Last Name", :with => "Smith"
- fill_in "order_bill_address_attributes_address1", :with => "1 John Street"
- fill_in "City", :with => "City of John"
- fill_in "Zip", :with => "01337"
- select "United States of America", :from => "Country"
- select "Alabama", :from => "order[bill_address_attributes][state_id]"
- fill_in "Phone", :with => "555-555-5555"
+ fill_in 'First Name', with: 'John'
+ fill_in 'Last Name', with: 'Smith'
+ fill_in 'order_bill_address_attributes_address1', with: '1 John Street'
+ fill_in 'City', with: 'City of John'
+ fill_in 'Zip', with: '01337'
+ select 'United States of America', from: 'Country'
+ select 'Alabama', from: 'order[bill_address_attributes][state_id]'
+ fill_in 'Phone', with: '555-555-5555'
end
- check "Use Billing Address"
+ check 'Use Billing Address'
# To shipping method screen
- click_button "Save and Continue"
+ click_button 'Save and Continue'
# To payment screen
- click_button "Save and Continue"
- choose "Check"
- click_button "Save and Continue"
+ click_button 'Save and Continue'
+ choose 'Check'
+ click_button 'Save and Continue'
expect(page).to have_content(Spree::Order.last.number)
end
@@ -98,5 +100,4 @@
expect(page).not_to have_content('Gift Card')
expect(Spree::GiftCard.count).to eql(0)
end
-
end
diff --git a/spec/jobs/sent_gift_card_emails_job_spec.rb b/spec/jobs/sent_gift_card_emails_job_spec.rb
index cef3622..638ff08 100644
--- a/spec/jobs/sent_gift_card_emails_job_spec.rb
+++ b/spec/jobs/sent_gift_card_emails_job_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'rails_helper'
RSpec.describe SentGiftCardEmailsJob, type: :job do
diff --git a/spec/models/spree/app_configuration_decorator_spec.rb b/spec/models/spree/app_configuration_decorator_spec.rb
index 18b3158..e0abda4 100644
--- a/spec/models/spree/app_configuration_decorator_spec.rb
+++ b/spec/models/spree/app_configuration_decorator_spec.rb
@@ -1,11 +1,13 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
describe Spree::AppConfiguration do
- it "expects to have preference allow_gift_card_redeem" do
+ it 'expects to have preference allow_gift_card_redeem' do
expect(Spree::Config.has_preference?(:allow_gift_card_redeem)).to be_truthy
end
- it "expects to set preference allow_gift_card_redeem default to true" do
+ it 'expects to set preference allow_gift_card_redeem default to true' do
expect(Spree::Config.allow_gift_card_redeem).to eq(true)
end
end
diff --git a/spec/models/spree/calculator/gift_card_spec.rb b/spec/models/spree/calculator/gift_card_spec.rb
index 3217047..061271d 100644
--- a/spec/models/spree/calculator/gift_card_spec.rb
+++ b/spec/models/spree/calculator/gift_card_spec.rb
@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::Calculator::GiftCardCalculator, type: :model do
-
let(:calculator) { Spree::Calculator::GiftCardCalculator.new }
let(:gift_card) { create(:gift_card, variant: create(:variant, price: 25)) }
let(:order) { mock_model(Spree::Order, total: 100) }
@@ -13,24 +14,23 @@
describe '#compute' do
context 'when current value of gift_card is 0' do
before { allow(gift_card).to receive(:current_value).and_return(0) }
- it "should compute 0 if current value is 0" do
+ it 'should compute 0 if current value is 0' do
expect(calculator.compute(order, gift_card)).to eql 0
end
end
context 'when order total less than current value' do
before { allow(gift_card).to receive(:current_value).and_return(120) }
- it "should compute 0 if current value is 0" do
- expect(calculator.compute(order, gift_card)).to eql -100
+ it 'should compute 0 if current value is 0' do
+ expect(calculator.compute(order, gift_card)).to eql(-100)
end
end
context 'when order total greater than current value' do
before { allow(order).to receive(:total).and_return(125) }
- it "should compute 0 if current value is 0" do
- expect(calculator.compute(order, gift_card)).to eql -25
+ it 'should compute 0 if current value is 0' do
+ expect(calculator.compute(order, gift_card)).to eql(-25)
end
end
end
-
end
diff --git a/spec/models/spree/gift_card_spec.rb b/spec/models/spree/gift_card_spec.rb
index 406fd39..a386700 100644
--- a/spec/models/spree/gift_card_spec.rb
+++ b/spec/models/spree/gift_card_spec.rb
@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::GiftCard, type: :model do
-
# Associations
it { is_expected.to have_many(:transactions) }
# Constants
- it { expect(Spree::GiftCard::UNACTIVATABLE_ORDER_STATES).to eq(["complete", "awaiting_return", "returned"]) }
+ it { expect(Spree::GiftCard::UNACTIVATABLE_ORDER_STATES).to eq(%w[complete awaiting_return returned]) }
it { expect(Spree::GiftCard::AUTHORIZE_ACTION).to eq('authorize') }
it { expect(Spree::GiftCard::CAPTURE_ACTION).to eq('capture') }
it { expect(Spree::GiftCard::VOID_ACTION).to eq('void') }
@@ -20,54 +21,54 @@
it { is_expected.to validate_numericality_of(:current_value).is_greater_than_or_equal_to(0).allow_nil }
- describe "amount_remaining_is_positive" do
+ describe 'amount_remaining_is_positive' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
- context "when current_value is greater than authorized_amount" do
+ context 'when current_value is greater than authorized_amount' do
before do
gift_card.current_value = 25.0
gift_card.authorized_amount = 20.0
end
- it "expects not to add error to authorized_amount" do
+ it 'expects not to add error to authorized_amount' do
gift_card.valid?
expect(gift_card.errors[:authorized_amount]).not_to include(Spree.t('errors.gift_card.greater_than_current_value'))
end
end
- context "when current_value is equal to authorized_amount" do
+ context 'when current_value is equal to authorized_amount' do
before do
gift_card.current_value = 25.0
gift_card.authorized_amount = 25.0
end
- it "expects not to add error to authorized_amount" do
+ it 'expects not to add error to authorized_amount' do
gift_card.valid?
expect(gift_card.errors[:authorized_amount]).not_to include(Spree.t('errors.gift_card.greater_than_current_value'))
end
end
- context "when current_value is less than authorized_amount" do
+ context 'when current_value is less than authorized_amount' do
before do
gift_card.current_value = 25.0
gift_card.authorized_amount = 30.0
end
- it "expects to add error to authorized_amount" do
+ it 'expects to add error to authorized_amount' do
gift_card.valid?
expect(gift_card.errors[:authorized_amount]).to include(Spree.t('errors.gift_card.greater_than_current_value'))
end
end
end
- it "expects to generate code before create" do
- card = Spree::GiftCard.create(:email => "test@mail.com", :name => "John", :variant_id => create(:variant).id)
+ it 'expects to generate code before create' do
+ card = Spree::GiftCard.create(email: 'test@mail.com', name: 'John', variant_id: create(:variant).id)
expect(card.code).not_to be_nil
end
- it "expects to set current_value and original_value before create" do
- card = Spree::GiftCard.create(:email => "test@mail.com", :name => "John", :variant_id => create(:variant).id)
+ it 'expects to set current_value and original_value before create' do
+ card = Spree::GiftCard.create(email: 'test@mail.com', name: 'John', variant_id: create(:variant).id)
expect(card.current_value).not_to be_nil
expect(card.original_value).not_to be_nil
end
@@ -76,24 +77,28 @@
let(:gift_card) { create(:gift_card, variant: create(:variant, price: 25)) }
it 'expects to be activatable if created before order, has current value, and order state valid' do
- expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart', created_at: (gift_card.created_at + 1.second)))).to be_truthy
+ expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart',
+ created_at: (gift_card.created_at + 1.second)))).to be_truthy
end
it 'expects not to be activatable if created after order' do
- expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart', created_at: (gift_card.created_at - 1.second)))).to be_falsey
+ expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart',
+ created_at: (gift_card.created_at - 1.second)))).to be_falsey
end
it 'expects not to be activatable if no current value' do
allow(gift_card).to receive(:current_value).and_return(0)
- expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart', created_at: (gift_card.created_at + 1.second)))).to be_falsey
+ expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'cart',
+ created_at: (gift_card.created_at + 1.second)))).to be_falsey
end
it 'expects not to be activatable if invalid order state' do
- expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'complete', created_at: (gift_card.created_at + 1.second)))).to be_falsey
+ expect(gift_card.order_activatable?(mock_model(Spree::Order, state: 'complete',
+ created_at: (gift_card.created_at + 1.second)))).to be_falsey
end
end
- describe "#amount_remaining" do
+ describe '#amount_remaining' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
@@ -102,12 +107,12 @@
gift_card.authorized_amount = 20.3
end
- it "expects to return difference of current_value and authorized_amount" do
+ it 'expects to return difference of current_value and authorized_amount' do
expect(gift_card.amount_remaining).to eq(4.9)
end
end
- describe "authorize" do
+ describe 'authorize' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
let(:order) { create(:order) }
@@ -116,88 +121,95 @@ def gift_card_authorize
gift_card.authorize(authorized_amount, order_number: order.number)
end
- context "when already authorized" do
+ context 'when already authorized' do
let(:auth_code) { gift_card.generate_authorization_code }
- let(:authorized_amount) { 13.0 }
+ let(:authorized_amount) { 13.0 }
before do
- gift_card.transactions.create!(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount, authorization_code: auth_code)
+ gift_card.transactions.create!(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount,
+ authorization_code: auth_code)
end
- it "expects to return true" do
+ it 'expects to return true' do
expect(gift_card.authorize(authorized_amount, action_authorization_code: auth_code)).to be_truthy
end
- it "expects not to re-authorize given amount" do
- expect {
+ it 'expects not to re-authorize given amount' do
+ expect do
gift_card.authorize(authorized_amount, action_authorization_code: auth_code)
- }.to_not change { gift_card.authorized_amount }
+ end.to_not change { gift_card.authorized_amount }
end
end
- context "when authorization amount is less than amount remaining" do
- let(:authorized_amount) { 23.9 }
+ context 'when authorization amount is less than amount remaining' do
+ let(:authorized_amount) { 23.9 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(gift_card_authorize).to_not be_falsey
end
- it "expects to authorize given amount" do
- expect {
+ it 'expects to authorize given amount' do
+ expect do
gift_card_authorize
- }.to change { gift_card.authorized_amount }.by(authorized_amount)
+ end.to change { gift_card.authorized_amount }.by(authorized_amount)
end
- it "expects to create an authorize transaction for the given amount" do
+ it 'expects to create an authorize transaction for the given amount' do
gift_card_authorize
- expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount,
+ order: order).exists?).to be_truthy
end
end
- context "when authorization amount is equal to amount remaining" do
- let(:authorized_amount) { 25.0 }
+ context 'when authorization amount is equal to amount remaining' do
+ let(:authorized_amount) { 25.0 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(gift_card_authorize).to_not be_falsey
end
- it "expects to authorize given amount" do
- expect {
+ it 'expects to authorize given amount' do
+ expect do
gift_card_authorize
- }.to change { gift_card.authorized_amount }.by(authorized_amount)
+ end.to change { gift_card.authorized_amount }.by(authorized_amount)
end
- it "expects to create an authorize transaction for the given amount" do
+ it 'expects to create an authorize transaction for the given amount' do
gift_card_authorize
- expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount,
+ order: order).exists?).to be_truthy
end
end
- context "when authorization amount is greater than amount remaining" do
- let(:authorized_amount) { 26.0 }
+ context 'when authorization amount is greater than amount remaining' do
+ let(:authorized_amount) { 26.0 }
- it "expects to return false" do
+ it 'expects to return false' do
expect(gift_card_authorize).to be_falsey
end
- it "expects not to authorize given amount" do
- expect {
+ it 'expects not to authorize given amount' do
+ expect do
gift_card_authorize
- }.not_to change { gift_card.authorized_amount }
+ end.not_to change { gift_card.authorized_amount }
end
- it "expects not to create an authorize transaction for the given amount" do
+ it 'expects not to create an authorize transaction for the given amount' do
gift_card_authorize
- expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount,
+ order: order).exists?).to be_falsey
end
end
end
- describe "capture" do
+ describe 'capture' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
let(:authorized_amount) { 13.0 }
- let(:auth_code) { gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount).authorization_code }
+ let(:auth_code) do
+ gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION,
+ amount: authorized_amount).authorization_code
+ end
let(:order) { create(:order) }
before do
@@ -209,113 +221,120 @@ def capture_payment
gift_card.capture(capture_amount, auth_code, order_number: order.number)
end
- context "when capture amount is less than authorized_amount" do
+ context 'when capture amount is less than authorized_amount' do
let(:capture_amount) { 10.0 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(capture_payment).to be_truthy
end
- it "expects to remove amount from authorization" do
- expect {
+ it 'expects to remove amount from authorization' do
+ expect do
capture_payment
- }.to change { gift_card.authorized_amount }.by(-capture_amount)
+ end.to change { gift_card.authorized_amount }.by(-capture_amount)
end
- it "expects to remove amount from current_value" do
- expect {
+ it 'expects to remove amount from current_value' do
+ expect do
capture_payment
- }.to change { gift_card.current_value }.by(-capture_amount)
+ end.to change { gift_card.current_value }.by(-capture_amount)
end
- it "expects to create a capture transaction for the given amount" do
+ it 'expects to create a capture transaction for the given amount' do
capture_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount, authorization_code: auth_code, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount,
+ authorization_code: auth_code, order: order).exists?).to be_truthy
end
end
- context "when capture amount is equal to authorized_amount" do
+ context 'when capture amount is equal to authorized_amount' do
let(:capture_amount) { 13.0 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(capture_payment).to be_truthy
end
- it "expects to remove amount from authorization" do
- expect {
+ it 'expects to remove amount from authorization' do
+ expect do
capture_payment
- }.to change { gift_card.authorized_amount }.by(-capture_amount)
+ end.to change { gift_card.authorized_amount }.by(-capture_amount)
end
- it "expects to remove amount from current_value" do
- expect {
+ it 'expects to remove amount from current_value' do
+ expect do
capture_payment
- }.to change { gift_card.current_value }.by(-capture_amount)
+ end.to change { gift_card.current_value }.by(-capture_amount)
end
- it "expects to create a capture transaction for the given amount" do
+ it 'expects to create a capture transaction for the given amount' do
capture_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount, authorization_code: auth_code, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount,
+ authorization_code: auth_code, order: order).exists?).to be_truthy
end
end
- context "when capture amount is greater than authorized_amount" do
+ context 'when capture amount is greater than authorized_amount' do
let(:capture_amount) { 15.0 }
- it "expects to return false" do
+ it 'expects to return false' do
expect(capture_payment).to be_falsey
end
- it "expects not to remove amount from authorization" do
- expect {
+ it 'expects not to remove amount from authorization' do
+ expect do
capture_payment
- }.to_not change { gift_card.authorized_amount }
+ end.to_not change { gift_card.authorized_amount }
end
- it "expects not to remove amount from current_value" do
- expect {
+ it 'expects not to remove amount from current_value' do
+ expect do
capture_payment
- }.to_not change { gift_card.current_value }
+ end.to_not change { gift_card.current_value }
end
- it "expects not to create a capture transaction for the given amount" do
+ it 'expects not to create a capture transaction for the given amount' do
capture_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount, authorization_code: auth_code, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount,
+ authorization_code: auth_code, order: order).exists?).to be_falsey
end
end
- context "when authorization_code is invalid" do
+ context 'when authorization_code is invalid' do
let(:capture_amount) { 10.0 }
- let(:auth_code) { super() + "123" }
+ let(:auth_code) { "#{super()}123" }
- it "expects to return false" do
+ it 'expects to return false' do
expect(capture_payment).to be_falsey
end
- it "expects not to remove amount from authorization" do
- expect {
+ it 'expects not to remove amount from authorization' do
+ expect do
capture_payment
- }.to_not change { gift_card.authorized_amount }
+ end.to_not change { gift_card.authorized_amount }
end
- it "expects not to remove amount from current_value" do
- expect {
+ it 'expects not to remove amount from current_value' do
+ expect do
capture_payment
- }.to_not change { gift_card.current_value }
+ end.to_not change { gift_card.current_value }
end
- it "expects not to create a capture transaction for the given amount" do
+ it 'expects not to create a capture transaction for the given amount' do
capture_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount, authorization_code: auth_code, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CAPTURE_ACTION, amount: capture_amount,
+ authorization_code: auth_code, order: order).exists?).to be_falsey
end
end
end
- describe "void" do
+ describe 'void' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
let(:authorized_amount) { 13.0 }
- let(:auth_code) { gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: authorized_amount).authorization_code }
+ let(:auth_code) do
+ gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION,
+ amount: authorized_amount).authorization_code
+ end
let(:order) { create(:order) }
def void_payment
@@ -327,48 +346,53 @@ def void_payment
auth_code
end
- context "when auth transaction present with auth code" do
- it "expects not to return false" do
+ context 'when auth transaction present with auth code' do
+ it 'expects not to return false' do
expect(void_payment).to be_truthy
end
- it "expects to remove amount from authorized_amount" do
- expect {
+ it 'expects to remove amount from authorized_amount' do
+ expect do
void_payment
- }.to change { gift_card.authorized_amount }.by(-authorized_amount)
+ end.to change { gift_card.authorized_amount }.by(-authorized_amount)
end
- it "expects to create a void transaction for the given amount" do
+ it 'expects to create a void transaction for the given amount' do
void_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::VOID_ACTION, amount: authorized_amount, authorization_code: auth_code, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::VOID_ACTION, amount: authorized_amount,
+ authorization_code: auth_code, order: order).exists?).to be_truthy
end
end
- context "when auth transaction not present with auth code" do
- let(:auth_code) { super() + "123" }
+ context 'when auth transaction not present with auth code' do
+ let(:auth_code) { "#{super()}123" }
- it "expects to return false" do
+ it 'expects to return false' do
expect(void_payment).to be_falsey
end
- it "expects not to remove amount from authorization" do
- expect {
+ it 'expects not to remove amount from authorization' do
+ expect do
void_payment
- }.to_not change { gift_card.authorized_amount }
+ end.to_not change { gift_card.authorized_amount }
end
- it "expects not to create a void transaction for the given amount" do
+ it 'expects not to create a void transaction for the given amount' do
void_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::VOID_ACTION, amount: authorized_amount, authorization_code: auth_code, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::VOID_ACTION, amount: authorized_amount,
+ authorization_code: auth_code, order: order).exists?).to be_falsey
end
end
end
- describe "credit" do
+ describe 'credit' do
let(:variant) { create(:variant, price: 25) }
let(:gift_card) { create(:gift_card, variant: variant) }
let(:captured_amount) { 13.0 }
- let(:auth_code) { gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION, amount: captured_amount).authorization_code }
+ let(:auth_code) do
+ gift_card.transactions.find_by(action: Spree::GiftCard::AUTHORIZE_ACTION,
+ amount: captured_amount).authorization_code
+ end
let(:order) { create(:order) }
before do
@@ -381,80 +405,84 @@ def credit_payment
gift_card.credit(credit_amount, auth_code, order_number: order.number)
end
- context "when credit amount is less than captured amount" do
+ context 'when credit amount is less than captured amount' do
let(:credit_amount) { 10.0 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(credit_payment).to be_truthy
end
- it "expects to add amount to current_value" do
- expect {
+ it 'expects to add amount to current_value' do
+ expect do
credit_payment
- }.to change { gift_card.current_value }.by(credit_amount)
+ end.to change { gift_card.current_value }.by(credit_amount)
end
- it "expects to create a credit transaction for the given amount" do
+ it 'expects to create a credit transaction for the given amount' do
credit_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount, authorization_code: auth_code, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount,
+ authorization_code: auth_code, order: order).exists?).to be_truthy
end
end
- context "when credit amount is equal to captured amount" do
+ context 'when credit amount is equal to captured amount' do
let(:credit_amount) { 13.0 }
- it "expects not to return false" do
+ it 'expects not to return false' do
expect(credit_payment).to be_truthy
end
- it "expects to add amount to current_value" do
- expect {
+ it 'expects to add amount to current_value' do
+ expect do
credit_payment
- }.to change { gift_card.current_value }.by(credit_amount)
+ end.to change { gift_card.current_value }.by(credit_amount)
end
- it "expects to create a credit transaction for the given amount" do
+ it 'expects to create a credit transaction for the given amount' do
credit_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount, authorization_code: auth_code, order: order).exists?).to be_truthy
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount,
+ authorization_code: auth_code, order: order).exists?).to be_truthy
end
end
- context "when credit amount is greater than captured amount" do
+ context 'when credit amount is greater than captured amount' do
let(:credit_amount) { 15.0 }
- it "expects to return false" do
+ it 'expects to return false' do
expect(credit_payment).to be_falsey
end
- it "expects not to add amount to current_value" do
- expect {
+ it 'expects not to add amount to current_value' do
+ expect do
credit_payment
- }.to_not change { gift_card.current_value }
+ end.to_not change { gift_card.current_value }
end
- it "expects not to create a credit transaction for the given amount" do
+ it 'expects not to create a credit transaction for the given amount' do
credit_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount, authorization_code: auth_code, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount,
+ authorization_code: auth_code, order: order).exists?).to be_falsey
end
end
- context "when authorization_code is invalid" do
+ context 'when authorization_code is invalid' do
let(:credit_amount) { 10.0 }
- let(:auth_code) { super() + "123" }
+ let(:auth_code) { "#{super()}123" }
- it "expects to return false" do
+ it 'expects to return false' do
expect(credit_payment).to be_falsey
end
- it "expects not to add amount to current_value" do
- expect {
+ it 'expects not to add amount to current_value' do
+ expect do
credit_payment
- }.to_not change { gift_card.current_value }
+ end.to_not change { gift_card.current_value }
end
- it "expects not to create a credit transaction for the given amount" do
+ it 'expects not to create a credit transaction for the given amount' do
credit_payment
- expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount, authorization_code: auth_code, order: order).exists?).to be_falsey
+ expect(gift_card.transactions.where(action: Spree::GiftCard::CREDIT_ACTION, amount: credit_amount,
+ authorization_code: auth_code, order: order).exists?).to be_falsey
end
end
end
@@ -500,79 +528,79 @@ def safely_redeem
gift_card.safely_redeem(user)
end
- context "when gift_card_redemption is not allowed" do
+ context 'when gift_card_redemption is not allowed' do
before do
Spree::Config[:allow_gift_card_redeem] = false
end
- it "expects to return false" do
+ it 'expects to return false' do
expect(safely_redeem).to be_falsey
end
- it "expects to add error" do
+ it 'expects to add error' do
safely_redeem
expect(gift_card.errors[:base]).to include(Spree.t('errors.gift_card.unauthorized'))
end
end
- context "when user is not present" do
+ context 'when user is not present' do
let(:user) { nil }
- it "expects to return false" do
+ it 'expects to return false' do
expect(safely_redeem).to be_falsey
end
- it "expects to add error" do
+ it 'expects to add error' do
safely_redeem
expect(gift_card.errors[:base]).to include(Spree.t('errors.gift_card.unauthorized'))
end
end
- context "when user email does not match gift card" do
+ context 'when user email does not match gift card' do
let(:user) { create(:user) }
- it "expects to return false" do
+ it 'expects to return false' do
expect(safely_redeem).to be_falsey
end
- it "expects to add error" do
+ it 'expects to add error' do
safely_redeem
expect(gift_card.errors[:base]).to include(Spree.t('errors.gift_card.unauthorized'))
end
end
- context "when amount_remaining is zero" do
+ context 'when amount_remaining is zero' do
before do
gift_card.update_column(:authorized_amount, gift_card.current_value)
end
- it "expects to return false" do
+ it 'expects to return false' do
expect(safely_redeem).to be_falsey
end
- it "expects to add error" do
+ it 'expects to add error' do
safely_redeem
expect(gift_card.errors[:base]).to include(Spree.t('errors.gift_card.already_redeemed'))
end
end
- context "when order is not completed" do
+ context 'when order is not completed' do
before do
order.update_column(:completed_at, nil)
end
- it "expects to return false" do
+ it 'expects to return false' do
expect(safely_redeem).to be_falsey
end
- it "expects to add error" do
+ it 'expects to add error' do
safely_redeem
expect(gift_card.errors[:base]).to include(Spree.t('errors.gift_card.unauthorized'))
end
end
- context "when valid redeem" do
- it "expects to return true" do
+ context 'when valid redeem' do
+ it 'expects to return true' do
expect(safely_redeem).to be_truthy
end
@@ -581,7 +609,7 @@ def safely_redeem
expect(user.store_credits.where(category: gift_card_category, amount: 25.0).exists?).to be_truthy
end
- it "expects to set current_value to zero" do
+ it 'expects to set current_value to zero' do
safely_redeem
expect(gift_card.current_value).to eq(0.0)
end
diff --git a/spec/models/spree/gift_card_transaction_spec.rb b/spec/models/spree/gift_card_transaction_spec.rb
index d34e049..54c223d 100644
--- a/spec/models/spree/gift_card_transaction_spec.rb
+++ b/spec/models/spree/gift_card_transaction_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::GiftCardTransaction do
diff --git a/spec/models/spree/line_item_spec.rb b/spec/models/spree/line_item_spec.rb
index 57ae4d9..69c6977 100644
--- a/spec/models/spree/line_item_spec.rb
+++ b/spec/models/spree/line_item_spec.rb
@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::LineItem do
-
subject do
line_item = FactoryGirl.build(:gift_card).line_item
allow(line_item.product).to receive(:is_gift_card?).and_return(true)
@@ -10,6 +11,7 @@
it { is_expected.to have_one(:gift_card).dependent(:destroy) }
it { is_expected.to validate_presence_of(:gift_card) }
- it { is_expected.to validate_numericality_of(:quantity).is_less_than_or_equal_to(::Spree::LineItem::MAXIMUM_GIFT_CARD_LIMIT).allow_nil }
-
+ it {
+ is_expected.to validate_numericality_of(:quantity).is_less_than_or_equal_to(::Spree::LineItem::MAXIMUM_GIFT_CARD_LIMIT).allow_nil
+ }
end
diff --git a/spec/models/spree/order/gift_card_spec.rb b/spec/models/spree/order/gift_card_spec.rb
index 6a32b94..356d0f8 100644
--- a/spec/models/spree/order/gift_card_spec.rb
+++ b/spec/models/spree/order/gift_card_spec.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe 'Order' do
describe '#add_gift_card_payments' do
let(:order_total) { 500.00 }
let(:gift_card) { create(:gift_card) }
- let(:gift_card_code) { "gc123" }
+ let(:gift_card_code) { 'gc123' }
before { create(:gift_card_payment_method) }
@@ -92,12 +94,12 @@
let(:applicable_store_credit) { 10.0 }
it 'deducts the applicable store credit' do
- expect(subject.order_total_after_store_credit).to eq (order_total - applicable_store_credit)
+ expect(subject.order_total_after_store_credit).to eq(order_total - applicable_store_credit)
end
end
- context "order has gift card payments" do
- let(:gift_card_code) { "gc123" }
+ context 'order has gift card payments' do
+ let(:gift_card_code) { 'gc123' }
let(:gift_card_total) { 20.0 }
let(:variant) { create(:variant, price: gift_card_total) }
let(:gift_card) { create(:gift_card, code: gift_card_code, variant: variant) }
@@ -113,14 +115,14 @@
end
it 'deducts the applicable gift card payment amount' do
- expect(subject.order_total_after_store_credit).to eq (order_total - gift_card_total)
+ expect(subject.order_total_after_store_credit).to eq(order_total - gift_card_total)
end
context "order's user has store credits" do
let(:applicable_store_credit) { 10.0 }
it 'deducts the applicable store credit' do
- expect(subject.order_total_after_store_credit).to eq (order_total - applicable_store_credit - gift_card_total)
+ expect(subject.order_total_after_store_credit).to eq(order_total - applicable_store_credit - gift_card_total)
end
end
end
@@ -143,7 +145,7 @@
subject { order }
it 'returns the sum of the payment amounts' do
- expect(subject.total_applied_gift_card).to eq (payment.amount + second_payment.amount)
+ expect(subject.total_applied_gift_card).to eq(payment.amount + second_payment.amount)
end
end
@@ -186,7 +188,7 @@
end
it 'returns a negative amount' do
- expect(subject.display_total_applied_gift_card.money.cents).to eq (total_applied_gift_card * -100.0)
+ expect(subject.display_total_applied_gift_card.money.cents).to eq(total_applied_gift_card * -100.0)
end
end
@@ -249,8 +251,8 @@
expect(order.payments.first.amount).to eq store_credit_total
end
- context "order has gift card payments" do
- let(:gift_card_code) { "gc123" }
+ context 'order has gift card payments' do
+ let(:gift_card_code) { 'gc123' }
let(:gift_card_total) { 20.0 }
let(:variant) { create(:variant, price: gift_card_total) }
let(:gift_card) { create(:gift_card, code: gift_card_code, variant: variant) }
diff --git a/spec/models/spree/payment_decorator_spec.rb b/spec/models/spree/payment_decorator_spec.rb
index d4d6dc7..f2c01e4 100644
--- a/spec/models/spree/payment_decorator_spec.rb
+++ b/spec/models/spree/payment_decorator_spec.rb
@@ -1,50 +1,51 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::Payment, type: :model do
-
describe 'delegate' do
it { is_expected.to delegate_method(:gift_card?).to(:payment_method) }
end
- describe ".gift_cards" do
- context "when payment using gift_card" do
+ describe '.gift_cards' do
+ context 'when payment using gift_card' do
let!(:payment) { create(:gift_card_payment) }
- it "expects to be included in gift_cards payments" do
+ it 'expects to be included in gift_cards payments' do
expect(Spree::Payment.gift_cards).to include(payment)
end
end
- context "when payment not using gift_card" do
+ context 'when payment not using gift_card' do
let!(:payment) { create(:payment) }
- it "expects not to be included in gift_cards payments" do
+ it 'expects not to be included in gift_cards payments' do
expect(Spree::Payment.gift_cards).not_to include(payment)
end
end
end
- describe "#store_credit_or_gift_card?" do
- context "when payment using gift_card" do
+ describe '#store_credit_or_gift_card?' do
+ context 'when payment using gift_card' do
let!(:payment) { create(:gift_card_payment) }
- it "expects to be true" do
+ it 'expects to be true' do
expect(payment.store_credit_or_gift_card?).to be_truthy
end
end
- context "when payment using store_credit" do
+ context 'when payment using store_credit' do
let!(:payment) { create(:store_credit_payment) }
- it "expects to be true" do
+ it 'expects to be true' do
expect(payment.store_credit_or_gift_card?).to be_truthy
end
end
- context "when payment using neither store_credit nor gift_card" do
+ context 'when payment using neither store_credit nor gift_card' do
let!(:payment) { create(:payment) }
- it "expects to be false" do
+ it 'expects to be false' do
expect(payment.store_credit_or_gift_card?).to be_falsey
end
end
diff --git a/spec/models/spree/payment_method/gift_card_spec.rb b/spec/models/spree/payment_method/gift_card_spec.rb
index ef3e9fa..571c427 100644
--- a/spec/models/spree/payment_method/gift_card_spec.rb
+++ b/spec/models/spree/payment_method/gift_card_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::PaymentMethod::GiftCard do
@@ -58,7 +60,10 @@
let(:auth_code) { gift_card_transaction.authorization_code }
let(:authorized_amount) { capture_amount / 100.0 }
- let(:gift_card_transaction) { create(:gift_card_transaction, gift_card: gift_card, amount: authorized_amount, action: Spree::GiftCard::AUTHORIZE_ACTION) }
+ let(:gift_card_transaction) do
+ create(:gift_card_transaction, gift_card: gift_card, amount: authorized_amount,
+ action: Spree::GiftCard::AUTHORIZE_ACTION)
+ end
let(:gift_card) { create(:gift_card, current_value: authorized_amount, authorized_amount: authorized_amount) }
context 'with an invalid auth code' do
@@ -190,7 +195,10 @@
let(:credit_amount) { gift_card.authorized_amount * 100 }
let(:auth_code) { gift_card_transaction.authorization_code }
- let(:gift_card_transaction) { create(:gift_card_transaction, gift_card: gift_card, amount: gift_card.authorized_amount, action: Spree::GiftCard::CAPTURE_ACTION) }
+ let(:gift_card_transaction) do
+ create(:gift_card_transaction, gift_card: gift_card, amount: gift_card.authorized_amount,
+ action: Spree::GiftCard::CAPTURE_ACTION)
+ end
let(:gift_card) { create(:gift_card) }
context 'with an invalid auth code' do
diff --git a/spec/models/spree/stock/quantifier_spec.rb b/spec/models/spree/stock/quantifier_spec.rb
index b758644..b39de9d 100644
--- a/spec/models/spree/stock/quantifier_spec.rb
+++ b/spec/models/spree/stock/quantifier_spec.rb
@@ -1,7 +1,6 @@
+# frozen_string_literal: true
+
require 'spec_helper'
describe Spree::Stock::Quantifier do
-
-
-
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 91c0eec..3a24c1a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Setup simplecov first to make sure coverage happens through everything.
require 'simplecov'
@@ -13,7 +15,7 @@
# Configure Rails Environment
ENV['RAILS_ENV'] = 'test'
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
require 'rspec/rails'
require 'database_cleaner'
@@ -24,7 +26,7 @@
# 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 }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
# Requires factories defined in spree_core
require 'spree/testing_support/factories'
@@ -36,7 +38,7 @@
RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
config.include Spree::TestingSupport::UrlHelpers
- config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature # once spree updates this can be removed
+ config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature # once spree updates this can be removed
config.color = true
config.infer_spec_type_from_file_location!
@@ -44,11 +46,11 @@
config.use_transactional_fixtures = false
config.before :each do |example|
- if example.metadata[:js]
- DatabaseCleaner.strategy = :truncation
- else
- DatabaseCleaner.strategy = :transaction
- end
+ DatabaseCleaner.strategy = if example.metadata[:js]
+ :truncation
+ else
+ :transaction
+ end
DatabaseCleaner.start
end
diff --git a/spree_gift_card.gemspec b/spree_gift_card.gemspec
index 4653f19..f45aca2 100644
--- a/spree_gift_card.gemspec
+++ b/spree_gift_card.gemspec
@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'spree_gift_card'
- s.version = '3.3.0'
+ s.version = '4.0.0'
s.summary = 'Spree Gift Card'
s.description = 'Spree Gift Card Extension'
- s.authors = ['Wojtek']
- s.email = ['wojtek@praesens.co']
- s.homepage = 'https://github.com/praesensco/spree_gift_card'
+ s.authors = ['Rahul Singh']
+ s.email = ['rahul@bluebash.co']
+ s.homepage = 'https://github.com/bluebash-spree-contrib/spree_gift_card'
- spree_version = '~> 3.3.0'
+ spree_version = '>= 4.8.0'
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_path = 'lib'
- s.required_ruby_version = '>= 2.2.0'
+ s.required_ruby_version = '>= 2.2.7'
s.requirements << 'none'
s.add_dependency 'spree_api', spree_version
@@ -28,11 +30,11 @@ Gem::Specification.new do |s|
s.add_development_dependency 'database_cleaner', '~> 1.0.1'
s.add_development_dependency 'factory_girl', '~> 4.2'
s.add_development_dependency 'ffaker'
- s.add_development_dependency 'rspec-rails', '~> 3.0'
+ s.add_development_dependency 'rspec-activemodel-mocks'
+ s.add_development_dependency 'rspec-rails', '~> 3.0'
s.add_development_dependency 'sass-rails', '~> 5.0.4'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'shoulda-matchers', '~> 3.1.0'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3'
- s.add_development_dependency 'rspec-activemodel-mocks'
end