Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gems #1241

Merged
merged 2 commits into from
Nov 28, 2018
Merged

Update gems #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84e6d01
Update gems
matt-hh Nov 13, 2018
6aadd47
Fix hound issue
matt-hh Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ GEM
kgio (2.11.2)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.9.0)
Expand All @@ -143,7 +143,7 @@ GEM
momentjs-rails (2.20.1)
railties (>= 3.1)
multipart-post (2.0.0)
nokogiri (1.8.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parser (2.5.1.2)
ast (~> 2.4.0)
Expand All @@ -160,7 +160,7 @@ GEM
public_suffix (3.0.3)
pundit (2.0.0)
activesupport (>= 3.0.0)
rack (2.0.5)
rack (2.0.6)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.1)
Expand Down Expand Up @@ -284,4 +284,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.16.3
1.17.1
29 changes: 15 additions & 14 deletions spec/factories.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
email { name.downcase.gsub(" ", "_") + "@example.com" }

transient do
order_count 3
order_count { 3 }
end

trait :with_orders do
Expand All @@ -18,36 +18,37 @@
factory :line_item do
order
product
unit_price 1.5
quantity 1
unit_price { 1.5 }
quantity { 1 }
end

factory :log_entry do
action "create"
action { "create" }
association :logeable, factory: :customer
end

factory :order do
customer
address_line_one "85 2nd St"
address_line_one { "85 2nd St" }
sequence(:address_line_two) { |n| "#700 (#{n})" }
address_city "San Francisco"
address_state "CA"
address_zip "94110"
address_city { "San Francisco" }
address_state { "CA" }
address_zip { "94110" }
end

factory :product do
sequence(:name) { |n| "Monopoly #{n}" }
price 10.50
description "A cutthroat game of financial conquest"
image_url \
price { 10.50 }
description { "A cutthroat game of financial conquest" }
image_url do
"https://cdn.recombu.com/mobile/images/news/M11370/1264769196_w670.jpg"
end
product_meta_tag
end

factory :product_meta_tag do
meta_title "meta_title"
meta_description "meta_description"
meta_title { "meta_title" }
meta_description { "meta_description" }
end

factory :payment do
Expand All @@ -56,7 +57,7 @@

factory :blog_post, class: "Blog::Post" do
sequence(:title) { |n| "Post #{n}" }
body "Empty"
body { "Empty" }
end

factory :series do
Expand Down