| Name | +Price | +Qty | +Item Total | ++ |
|---|---|---|---|---|
| <%= product.name %> | +<%= number_to_currency(product.price) %> | ++ <% if @order.status == "pending" %> + <%= button_to '-', options = { controller: 'order_items', action: "qty_decrease", id: item.id }, html_options = { class: "btn btn-default", form_class: "form-inline display-inline" } %> + <% end %> + <%= item.quantity %> + <% if @order.status == "pending" %> + <%= button_to "+", options = { controller: 'order_items', action: "qty_increase", id: item.id }, html_options = { class: "btn btn-default", form_class: "form-inline display-inline" } %> + <% end %> + | + +<%= number_to_currency(product.price * item.quantity) %> | ++ <% if @order.status == "pending" %> + <%= button_to("Remove from Cart", order_order_item_path(order_id: @order.id, id: item.id), method: :delete, class: "btn btn-default") %> + <% end %> + | +
<%= order_error_check_for(:state) %>
- <%= f.label :zipcode %> - <%= f.text_field :zipcode, class: "form-control" %> -<%= order_error_check_for(:zipcode) %>
+ <%= f.label :zip %> + <%= f.text_field :zip, class: "form-control" %> +<%= order_error_check_for(:zip) %>
<%= f.label :card_number %> <%= f.text_field :card_number, class: "form-control" %> @@ -43,7 +43,7 @@<%= order_error_check_for(:card_exp) %>
- <%= f.submit "Submit Order", class: 'btn btn-primary' %> + <%= f.submit "Next: Shipping Options", class: 'btn btn-primary' %> <% end %> diff --git a/app/views/orders/shipping.html.erb b/app/views/orders/shipping.html.erb new file mode 100644 index 00000000..cc72136f --- /dev/null +++ b/app/views/orders/shipping.html.erb @@ -0,0 +1,58 @@ +| Name | +Price | +Qty | +Total | +
|---|---|---|---|
| <%= link_to product.name, product_path(product) %> | +<%= number_to_currency(product.price) %> | ++ <%= item.quantity %> + | +<%= number_to_currency(product.price * item.quantity) %> | + <% @subtotal += (product.price * item.quantity) %> +
| + | Subtotal: | ++ <%= number_to_currency(@subtotal) %> + | +|
| + | Shipping: | ++ <%= display_dollars(@shipping_cost) %> + | +|
| + | Total: | ++ <%= display_dollars(@subtotal*100.0 + @shipping_cost) %> + | +|
| Name | -Price | -Qty | -Total | -- |
|---|---|---|---|---|
| <%= product.name %> | -<%= number_to_currency(product.price) %> | -- <% if @order.status == "pending" %> - <%= button_to '-', options = { controller: 'order_items', action: "qty_decrease", id: item.id }, html_options = { class: "btn btn-default", form_class: "form-inline display-inline" } %> - <% end %> - <%= item.quantity %> - <% if @order.status == "pending" %> - <%= button_to "+", options = { controller: 'order_items', action: "qty_increase", id: item.id }, html_options = { class: "btn btn-default", form_class: "form-inline display-inline" } %> - <% end %> - | - -<%= number_to_currency(product.price * item.quantity) %> | -- <% if @order.status == "pending" %> - <%= button_to("Remove from Cart", order_order_item_path(order_id: @order.id, id: item.id), method: :delete, class: "btn btn-default") %> - <% end %> - | -
Status: <%= @status %>
+Weight: <%= @product.weight_in_gms %> grams
+Dimensions (L X W X H): <%= dimensions(@product) %>
<% end %> - <%= link_to "Add to Cart", order_order_items_path(order_id: session[:order_id], product_id: @product.id), html_options = { method: :post, class: "btn btn-default" } %> + <% unless @product.user_id == session[:user_id] %> + <%= link_to "Add to Cart", order_order_items_path(order_id: session[:order_id], product_id: @product.id), html_options = { method: :post, class: "btn btn-default" } %> + <% end %> - <% if session[:user_id] %> + <% if session[:user_id] && @product.user_id == session[:user_id] %> <%= link_to "Edit Product", edit_user_product_path(user_id: session[:user_id], product_id: @product.id), method: :get, class: "btn btn-default" %> <%= link_to "Delete Product", product_path(@product.id), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger" %> <% end %> diff --git a/app/views/shared/_product_form.html.erb b/app/views/shared/_product_form.html.erb index 47a3cd2d..f196433f 100644 --- a/app/views/shared/_product_form.html.erb +++ b/app/views/shared/_product_form.html.erb @@ -1,45 +1,67 @@<%= error_check_for(:email) %>
<%= f.label :password %> - <%= f.text_field :password, class: "form-control" %> + <%= f.password_field :password, class: "form-control" %><%= error_check_for(:password) %>
<%= f.label :password_confirmation, "Password Confirmation" %> - <%= f.text_field :password_confirmation, class: "form-control" %> + <%= f.password_field :password_confirmation, class: "form-control" %><%= error_check_for(:password_confirmation) %>
+ + diff --git a/config/routes.rb b/config/routes.rb index 6fa930f1..3617b75b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do - root 'products#index' get 'users/orders', to: 'users#list_of_orders', as: 'users_orders' @@ -35,7 +34,10 @@ get 'orders/:id/payment', to: 'orders#payment', as: 'order_payment' put 'orders/:id/payment', to: 'orders#payment' + get 'orders/:id/shipping', to: 'orders#shipping', as: 'shipping' + post 'orders/:id/update_total', to: 'orders#update_total', as: 'update_total' + put 'orders/:id/finalize', to: 'orders#finalize', as: 'finalize' get 'orders/:id/confirmation', to: 'orders#confirmation', as: 'order_confirmation' - get 'orders/:id/completed', to: 'orders#completed', as: 'shipped_order' + get 'orders/:id/completed', to: 'orders#completed', as: 'shipped_order' end diff --git a/db/migrate/20150714215552_create_orders.rb b/db/migrate/20150714215552_create_orders.rb index ba4483a4..9c1e92c2 100644 --- a/db/migrate/20150714215552_create_orders.rb +++ b/db/migrate/20150714215552_create_orders.rb @@ -6,7 +6,7 @@ def change t.string :address2 t.string :city t.string :state - t.string :zipcode + t.integer :zip t.string :card_number t.string :card_last_4 t.datetime :card_exp diff --git a/db/migrate/20150722035609_change_active_format_in_products.rb b/db/migrate/20150722035609_change_active_format_in_products.rb deleted file mode 100644 index 7ea800b3..00000000 --- a/db/migrate/20150722035609_change_active_format_in_products.rb +++ /dev/null @@ -1,5 +0,0 @@ -class ChangeActiveFormatInProducts < ActiveRecord::Migration - def change - change_column :products, :active, :boolean, :default => true, :null => false - end -end diff --git a/db/migrate/20150819004202_add_weight_dimensions_to_product.rb b/db/migrate/20150819004202_add_weight_dimensions_to_product.rb new file mode 100644 index 00000000..9dc48d06 --- /dev/null +++ b/db/migrate/20150819004202_add_weight_dimensions_to_product.rb @@ -0,0 +1,8 @@ +class AddWeightDimensionsToProduct < ActiveRecord::Migration + def change + add_column :products, :weight_in_gms, :integer + add_column :products, :length_in_cms, :integer + add_column :products, :width_in_cms, :integer + add_column :products, :height_in_cms, :integer + end +end diff --git a/db/migrate/20150819035954_add_address_to_user.rb b/db/migrate/20150819035954_add_address_to_user.rb new file mode 100644 index 00000000..b8092049 --- /dev/null +++ b/db/migrate/20150819035954_add_address_to_user.rb @@ -0,0 +1,8 @@ +class AddAddressToUser < ActiveRecord::Migration + def change + add_column :users, :city, :string + add_column :users, :state, :string + add_column :users, :zip, :integer + add_column :users, :country, :string + end +end diff --git a/db/migrate/20150820165035_add_shipping_service_and_rate_to_orders.rb b/db/migrate/20150820165035_add_shipping_service_and_rate_to_orders.rb new file mode 100644 index 00000000..0130c7ff --- /dev/null +++ b/db/migrate/20150820165035_add_shipping_service_and_rate_to_orders.rb @@ -0,0 +1,6 @@ +class AddShippingServiceAndRateToOrders < ActiveRecord::Migration + def change + add_column :orders, :shipping_service, :string + add_column :orders, :shipping_cost, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 769be87b..096bf53b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150723234737) do +ActiveRecord::Schema.define(version: 20150820165035) do create_table "categories", force: :cascade do |t| t.string "name", null: false @@ -38,28 +38,33 @@ t.string "address2" t.string "city" t.string "state" - t.string "zipcode" - t.string "name_on_card" + t.integer "zip" t.string "card_number" t.string "card_last_4" t.datetime "card_exp" - t.string "status", default: "pending", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "status", default: "pending", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "ccv" - t.string "name", default: "guest", null: false + t.string "name", default: "guest", null: false + t.string "shipping_service" + t.integer "shipping_cost" end create_table "products", force: :cascade do |t| - t.string "name", null: false + t.string "name", null: false t.string "description" - t.decimal "price", precision: 7, scale: 2, null: false - t.string "photo_url", null: false - t.integer "inventory", null: false - t.boolean "active", default: true, null: false - t.integer "user_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.decimal "price", precision: 7, scale: 2, null: false + t.string "photo_url", null: false + t.integer "inventory", null: false + t.boolean "active", default: true, null: false + t.integer "user_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "weight_in_gms" + t.integer "length_in_cms" + t.integer "width_in_cms" + t.integer "height_in_cms" end create_table "reviews", force: :cascade do |t| @@ -81,6 +86,10 @@ t.string "password_digest", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "city" + t.string "state" + t.integer "zip" + t.string "country" end end diff --git a/db/seeds.rb b/db/seeds.rb index eb1940ba..25117c2c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -26,15 +26,27 @@ { username: "tacoparty", email: "taco@party.taco", password: "extraCheese", - password_confirmation: "extraCheese" }, + password_confirmation: "extraCheese", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" }, { username: "indubitably", email: "johnsnow@tennisrocks.uk", password: "aaronwilliams", - password_confirmation: "aaronwilliams" }, + password_confirmation: "aaronwilliams", + city: "South San Francisco", + state: "CA", + zip: 94080, + country: "US" }, { username: "mabel", email: "mabel@awesomedogs.woof", password: "growl", - password_confirmation: "growl" }, + password_confirmation: "growl", + city: "Chicago", + state: "IL", + zip: 60614, + country: "US" }, ] users.each do |user| @@ -57,7 +69,11 @@ inventory: 45, active: true, user_id: 1, - category_ids: 2 }, + category_ids: 2, + weight_in_gms: 1500, + length_in_cms: 30, + width_in_cms: 10, + height_in_cms: 5 }, { name: "Mr. T Costume for Dog", description: "Your dog will pity the fool with this totally awesome costume!", price: 25.00, @@ -65,7 +81,11 @@ inventory: 58, active: true, user_id: 2, - category_ids: [1, 3] }, + category_ids: [1, 3], + weight_in_gms: 500, + length_in_cms: 15, + width_in_cms: 8, + height_in_cms: 2 }, { name: "Mr. T Costume for Dog - Large", description: "Your dog will pity the fool with this totally awesome costume!", price: 35.00, @@ -73,7 +93,11 @@ inventory: 2, active: true, user_id: 1, - category_ids: [1, 3] }, + category_ids: [1, 3], + weight_in_gms: 1000, + length_in_cms: 20, + width_in_cms: 8, + height_in_cms: 3 }, { name: "Taco Costume - Large", description: "High-quality, one-size-fits-all adult hard-shelled taco costume (beef).", price: 40.00, @@ -81,7 +105,11 @@ inventory: 4, active: true, user_id: 2, - category_ids: 2 }, + category_ids: 2, + weight_in_gms: 1700, + length_in_cms: 30, + width_in_cms: 10, + height_in_cms: 7 }, ] products.each do |product| @@ -94,7 +122,7 @@ address2: "Outer reaches of the solar system", city: "Plutotown", state: "PA", - zipcode: 99999, + zip: 99999, card_last_4: 9999, card_exp: Time.new(2018, 8), status: "paid"}, @@ -103,7 +131,7 @@ address2: "Shack #2", city: "Caprica", state: "NC", - zipcode: 77777, + zip: 77777, card_last_4: 7777, card_exp: Time.new(2019, 9), status: "pending"}, @@ -113,5 +141,5 @@ Order.create(order) end -order = Order.new(id: 6) -order.save(validate: false) +# order = Order.new(id: 6) +# order.save(validate: false) diff --git a/lib/penguin_shipper_interface.rb b/lib/penguin_shipper_interface.rb new file mode 100644 index 00000000..116530b2 --- /dev/null +++ b/lib/penguin_shipper_interface.rb @@ -0,0 +1,99 @@ +class PenguinShipperInterface + COUNTRY = "US" + + PENGUIN_ALL_RATES_URI = Rails.env.production? ? + "https://whispering-shore-8365.herokuapp.com/get_all_rates" : + "http://localhost:4000/get_all_rates" + + def self.make_packages(grouped_items) + origin_package_pairs = [] + grouped_items.each do |merchant, items| + origin_package = {} + origin_package["origin"] = create_location(merchant) + origin_package["packages"] = [] + items.each do |item| + origin_package["packages"] << create_package(item) + end + origin_package_pairs << origin_package + end + origin_package_pairs + end + + def self.create_location(object) + location = {} + location["country"] = COUNTRY + location["state"] = object.state + location["city"] = object.city + location["zip"] = object.zip + return location + end + + def self.create_package(item) + package = {} + product = item.product + package["weight"] = product.weight_in_gms + + dimensions = [product.length_in_cms, product.width_in_cms, product.height_in_cms] + package["dimensions"] = dimensions + return package + end + + def self.request_rates_from_API(json_shipment) + response = HTTParty.get(PENGUIN_ALL_RATES_URI, query: { json_data: json_shipment } ) + case response.code + when 200 + return response.parsed_response + when 422 + return [{error: "422"}] + when 408 + return [{error: "408"}] + else + return [{error: "bad"}] + end + end + + def self.request_rates_for_packages(origin_package_pairs, destination) + all_rates = [] + + origin_package_pairs.each do |distinct_origin| + distinct_origin["destination"] = destination + shipment = {} + shipment["shipment"] = distinct_origin + + json_shipment = shipment.to_json + + results = request_rates_from_API(json_shipment) + all_rates += results + end + all_rates + end + + def self.process_rates(all_rates) + return all_rates if all_rates.first.keys.include?(:error) + calculated_rates = [] + + grouped_rates = all_rates.group_by { |rate| rate["service_name"] } + grouped_rates.each do |service, service_rate_pairs| + rate = {} + rate["service_name"] = service + rate["total_price"] = service_rate_pairs.inject(0) { |sum, rate| sum + rate["total_price"] } + rate["delivery_date"] = service_rate_pairs.last["delivery_date"] + calculated_rates << rate + end + calculated_rates + end + + def self.process_order(order) + order_items = order.order_items + + grouped_items = order_items.group_by { |order_item| order_item.product.user } + + origin_package_pairs = make_packages(grouped_items) + + destination = create_location(order) + + all_rates = request_rates_for_packages(origin_package_pairs, destination) + + @calculated_rates = process_rates(all_rates) + end +end diff --git a/spec/controllers/order_items_controller_spec.rb b/spec/controllers/order_items_controller_spec.rb index 57f88624..93237807 100644 --- a/spec/controllers/order_items_controller_spec.rb +++ b/spec/controllers/order_items_controller_spec.rb @@ -5,9 +5,9 @@ before :each do order = Order.create - product1 = Product.create(name: "product1", price: 20.22, photo_url: "www.example.com", inventory: 20, user_id: 1) - product2 = Product.create(name: "product2", price: 46.12, photo_url: "www.example.com", inventory: 20, user_id: 1) - product3 = Product.create(name: "product3", price: 25.32, photo_url: "www.example.com", inventory: 20, user_id: 1) + product1 = Product.create(name: "product1", price: 20.22, photo_url: "www.example.com", inventory: 20, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) + product2 = Product.create(name: "product2", price: 46.12, photo_url: "www.example.com", inventory: 20, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) + product3 = Product.create(name: "product3", price: 25.32, photo_url: "www.example.com", inventory: 20, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) orderItem1 = OrderItem.create(quantity: 1, order_id: 1, product_id: 1) @orderItem2 = OrderItem.create(quantity: 1, order_id: 1, product_id: 2) @@ -46,7 +46,7 @@ let(:session_key) { :order_id } before :each do - @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zipcode: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") + @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zip: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") @thing = OrderItem.create!(quantity: 2, order_id: 1, product_id: 1) @order.order_items << @thing @path_hash = { id: @thing.id, order_id: @order.id } @@ -56,7 +56,7 @@ # describe "DELETE #destroy" do # before(:each) do - # @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zipcode: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") + # @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zip: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") # @thing = OrderItem.create!(quantity: 2, order_id: 1, product_id: 1) # @order.order_items << @thing # end diff --git a/spec/controllers/orders_controller_spec.rb b/spec/controllers/orders_controller_spec.rb index 61b0f967..cd36bede 100644 --- a/spec/controllers/orders_controller_spec.rb +++ b/spec/controllers/orders_controller_spec.rb @@ -11,7 +11,7 @@ address2: "Apt Test", city: "Testcity", state: "WA", - zipcode: "55555", + zip: "55555", card_number: "123456789988", card_last_4: "6789", card_exp: Time.now @@ -21,11 +21,11 @@ end before :each do - @order = Order.create!(email: "hi@hi.com", address1: "123 someplace", city: "somewhere", state: "WA", zipcode: "12345", card_last_4: "1234", card_exp: "10-11") + @order = Order.create!(email: "hi@hi.com", address1: "123 someplace", city: "somewhere", state: "WA", zip: "12345", card_last_4: "1234", card_exp: "10-11") - product1 = Product.create!(name: "product1", price: 5, photo_url: "something.com", inventory: 10, user_id: 1) - product2 = Product.create!(name: "product2", price: 5, photo_url: "something.com", inventory: 10, user_id: 1) - product3 = Product.create!(name: "product3", price: 5, photo_url: "something.com", inventory: 10, user_id: 1) + product1 = Product.create!(name: "product1", price: 5, photo_url: "something.com", inventory: 10, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) + product2 = Product.create!(name: "product2", price: 5, photo_url: "something.com", inventory: 10, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) + product3 = Product.create!(name: "product3", price: 5, photo_url: "something.com", inventory: 10, user_id: 1, weight_in_gms: 100, length_in_cms: 10, width_in_cms: 5, height_in_cms: 15) @orderItem1 = OrderItem.create!(quantity: 1, order_id: 1, product_id: 1) @orderItem2 = OrderItem.create!(quantity: 1, order_id: 1, product_id: 2) @@ -42,7 +42,7 @@ describe "order #destroy action" do before :each do - @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zipcode: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") + @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zip: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") @thing = OrderItem.create!(quantity: 2, order_id: 1, product_id: 1) @order.order_items << @thing end @@ -63,7 +63,7 @@ # I worked on this for a long time and didn't get it figured out. :( -SM # describe "PUT update/:id" do # before :each do - # @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zipcode: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") + # @order = Order.create!(email: "email@email.com", address1: "Some place", city: "somewhere", state: "WA", zip: 10000, card_last_4: 1234, card_exp: Time.now, status: "paid") # @thing = OrderItem.create!(quantity: 2, order_id: 2, product_id: 1) # @order.order_items << @thing # diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb index c6350c37..8c0cae3a 100644 --- a/spec/controllers/products_controller_spec.rb +++ b/spec/controllers/products_controller_spec.rb @@ -13,7 +13,11 @@ price: 20.95, photo_url: "a_photo.jpg", inventory: 4, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 } }, create_user: true, @@ -31,7 +35,11 @@ price: 20.95, photo_url: "a_photo.jpg", inventory: 4, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 } end @@ -49,13 +57,18 @@ price: 20.95, photo_url: "a_photo.jpg", inventory: 4, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 } end before :each do @product = Product.create(params) - @user = User.create(username: "user", email: "email@email.com", password: "heloo", password_confirmation: "heloo") + @user = User.create(username: "user", email: "email@email.com", password: "heloo", password_confirmation: "heloo", + city: "Seattle", state: "WA", zip: 98101, country: "US") session[:user_id] = 1 put :update, user_id: params[:user_id], id: 1, :product => { name: "New Name", price: 25.95, inventory: 8 } @@ -79,28 +92,44 @@ username: "vendor", email: "email@email.com", password: "password", - password_confirmation: "password" + password_confirmation: "password", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) Product.create( name: "A product", price: 49.95, photo_url: "a_photo.jpg", inventory: 7, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) Product.create( name: "B product - different vendor", price: 22.95, photo_url: "b_photo.jpg", inventory: 71, - user_id: 2 + user_id: 2, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) Product.create( name: "C product", price: 30.00, photo_url: "c_photo.jpg", inventory: 13, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) @products = Product.all end @@ -124,7 +153,11 @@ price: 49.95, photo_url: "a_photo.jpg", inventory: 7, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) product_a.categories << cat_a product_a.categories << cat_b @@ -134,7 +167,11 @@ price: 4.95, photo_url: "B_photo.jpg", inventory: 5, - user_id: 2 + user_id: 2, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) product_b.categories << cat_a diff --git a/spec/controllers/reviews_controller_spec.rb b/spec/controllers/reviews_controller_spec.rb index 4b62851f..05560d5d 100644 --- a/spec/controllers/reviews_controller_spec.rb +++ b/spec/controllers/reviews_controller_spec.rb @@ -8,7 +8,11 @@ price: 20.00, photo_url: "a_photo.jpg", inventory: 10, - user_id: 1 + user_id: 1, + weight_in_gms: 100, + length_in_cms: 10, + width_in_cms: 5, + height_in_cms: 15 ) end @@ -26,7 +30,11 @@ username: "Test", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) get :new, {product_id: 1} diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 1324e19a..eb982f20 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -11,7 +11,11 @@ username: "Testwoman", email: "test@testing.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" } }, create_user: false, @@ -26,7 +30,11 @@ username: "Test", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) session[:user_id] = 1 get :new @@ -39,7 +47,11 @@ username: "Test", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) session[:user_id] = 1 get :new diff --git a/spec/factories.rb b/spec/factories.rb new file mode 100644 index 00000000..d7d97e50 --- /dev/null +++ b/spec/factories.rb @@ -0,0 +1,49 @@ +FactoryGirl.define do + factory :category do + name "Hats" + end + + factory :order_item do + quantity 1 + order_id 1 + product_id 1 + end + + factory :order do + email "somedude@someplace.com" + address1 "1111 Someplace Ave." + city "San Leandro" + state "CA" + zip 94578 + card_last_4 "1234" + card_exp Time.new(2017, 11) + end + + factory :product do + name "A product" + price 20.95 + photo_url "a_photo.jpg" + inventory 4 + user_id 1 + weight_in_gms 100 + length_in_cms 15 + width_in_cms 10 + height_in_cms 10 + end + + factory :review do + rating 5 + product_id 1 + end + + factory :user do + username "aname" + email "hi@email.com" + password "password" + password_confirmation "password" + city "Seattle" + state "WA" + zip 98101 + country "US" + end +end diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index efe4c189..c188f167 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -2,19 +2,18 @@ RSpec.describe Category, type: :model do describe "model validations" do - let(:category) { Category.new } - context "name" do it "is required" do - expect(category).to_not be_valid + category = build :category, name: nil + category.valid? expect(category.errors.keys).to include(:name) end it "is unique" do - Category.create!(name: "Hats") - same_category = Category.new(name: "Hats") - expect(same_category).to_not be_valid - expect(same_category.errors.keys).to include(:name) + create :category + same_category = build :category, name: "Hats" + same_category.valid? + expect(same_category.errors.messages).to eq(:name => ["has already been taken"]) end end end diff --git a/spec/models/order_item_spec.rb b/spec/models/order_item_spec.rb index aa76337d..d2bd0fb7 100644 --- a/spec/models/order_item_spec.rb +++ b/spec/models/order_item_spec.rb @@ -2,23 +2,27 @@ RSpec.describe OrderItem, type: :model do describe "validations" do + it "requires a quantity" do + order_item = build :order_item + order_item.valid? + expect(order_item.errors.keys).to_not include(:quantity) + end - # how can I test for presence when there's a default value? - it "defaults :quantity to 1" do - order_item = OrderItem.new(order_id: 1, product_id: 1) - - expect(order_item.save).to be true + it "defaults quantity to 1" do + order_item = build :order_item expect(order_item.quantity).to eq 1 end - it "doesn't allow :quantity to be a string" do - order_item = OrderItem.new(quantity: 'none', order_id: 1, product_id: 1) - expect(order_item.save).to be false + it "requires quantity to be a number" do + order_item = build :order_item, quantity: "three" + order_item.valid? + expect(order_item.errors.messages).to eq(:quantity => ["is not a number"]) end - it "doesn't allow :quantity to be less than 0" do - order_item = OrderItem.new(quantity: -10, order_id: 1, product_id: 1) - expect(order_item.save).to be false + it "requires quantity to be greater than 0" do + order_item = build :order_item, quantity: -1 + order_item.valid? + expect(order_item.errors.messages).to eq(:quantity => ["must be greater than 0"]) end end end diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index 5e129146..250051a6 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -3,30 +3,28 @@ RSpec.describe Order, type: :model do describe "model validations" do - let(:invalid_empty_order) { Order.new(status: nil) } # because status defaults to "pending" - let(:invalid_order) { Order.new } - let(:valid_order) { Order.new(email: "somedude@someplace.com", address1: "1111 Someplace Ave.", city: "Seattle", state: "WA", zipcode: "55555", card_last_4: "1234", card_exp: Time.new(2017, 11)) } - - required_fields = - [:email, :address1, :city, :state, :zipcode, - :card_last_4, :card_exp, :status] - - required_fields.each do |field| - it "requires #{field}" do - expect(invalid_empty_order).to_not be_valid - expect(invalid_empty_order.errors.keys).to include(field) + required_attributes = [:address1, :city, :state, :zip, :card_exp] + required_attributes.each do |attribute| + it "requires #{attribute}" do + order = build :order + order[attribute] = nil + order.valid? + expect(order.errors.keys).to include(attribute) end end + # There is more to validate than only presence with state, zip - context "status field" do - it "defaults to 'pending'" do - expect(invalid_order.status).to eq("pending") + context "card_last_4 field" do + it "requires card_last_4" do + order = build :order, card_last_4: nil + order.valid? + expect(order.errors.keys).to include(:card_last_4) end - end - context "card_last_4 field" do - it "has 4 characters" do - expect(valid_order.card_last_4.length).to eq(4) + it "requires 4 characters" do + order = build :order, card_last_4: 123 + order.valid? + expect(order.errors.keys).to include(:card_last_4) end ["1234", "5678", "9012"].each do |valid_card| @@ -37,54 +35,66 @@ ["hihi", "345", 959, 12.3, 12.34].each do |invalid_card| it "doesn't validate #{invalid_card} for card_last_4" do - new_order = valid_order - new_order.card_last_4 = invalid_card - - expect(new_order).to_not be_valid - expect(new_order.errors.keys).to include(:card_last_4) + order = build :order, card_last_4: invalid_card + order.valid? + expect(order.errors.keys).to include(:card_last_4) end end end context "status field" do - it "defaults pending" do - expect(invalid_order.status).to eq("pending") + it "requires status" do + order = build :order, status: nil + order.valid? + expect(order.errors.keys).to include(:status) + end + + it "status field defaults to 'pending'" do + order = build :order + expect(order.status).to eq("pending") end ["pending", "paid", "complete", "cancelled"].each do |valid_status| it "only contains valid statuses" do - new_order = valid_order - new_order.status = valid_status - expect(new_order).to be_valid + order = build :order, status: valid_status + expect(order).to be_valid end end ["not awesome", "345", 959, 12.3, 12.34].each do |invalid_status| - it "doesn't validate #{invalid_status} for status" do - new_order = valid_order - new_order.status = invalid_status - - expect(new_order).to_not be_valid - expect(new_order.errors.keys).to include(:status) + it "does not validate #{invalid_status} for status" do + order = build :order, status: invalid_status + order.valid? + expect(order.errors.messages).to eq(:status => ["#{invalid_status} is not a valid status"]) end end end - # Test status and default should be "pending"! + context "email" do + it "requires an email" do + user = build :order, email: nil + user.valid? + expect(user.errors.keys).to include(:email) + end - # Check card exp must be in the future. + it "requires an email to include '@' and '.'" do + user = build :order, email: "hello" + user.valid? + expect(user.errors.messages).to eq(:email => ["is invalid"]) + end + end end - describe "scope" do + describe "scopes" do before(:each) do # paid 3.times do - Order.create(email: "example@fake.com", address1: "1234 St", address2: "Apt. A", city: "Plainsville", state: "NA", zipcode: "12345", card_number: nil, card_last_4: "0987", card_exp: "05/06", status: "paid" ) + create :order, status: "paid" end # pending 3.times do - Order.create(email: "example@fake.com", address1: "1234 St", address2: "Apt. A", city: "Plainsville", state: "NA", zipcode: "12345", card_number: nil, card_last_4: "0987", card_exp: "05/06", status: "pending" ) + create :order end @orders = Order.all diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb index bddbaf88..a2a53cf0 100644 --- a/spec/models/product_spec.rb +++ b/spec/models/product_spec.rb @@ -3,97 +3,103 @@ RSpec.describe Product, type: :model do describe "model validations" do # Required attributes - required_attributes = [ "name", "price", "photo_url", "inventory", - "user_id" ] + required_attributes = [:photo_url, :user_id, :weight_in_gms, :length_in_cms, + :width_in_cms, :height_in_cms] required_attributes.each do |attribute| it "requires #{attribute}" do - product = Product.new - expect(product).to_not be_valid - expect(product.errors.keys).to include(attribute.to_sym) + product = build :product + product[attribute] = nil + product.valid? + expect(product.errors.keys).to include(attribute) end end - before :each do - @product_a = Product.create( - name: "A product", - price: 20.95, - photo_url: "a_photo.jpg", - inventory: 4, - user_id: 1 - ) - @product_b = Product.new( - name: "A product", - price: 21.95, - photo_url: "b_photo.jpg", - inventory: 2, - user_id: 2 - ) - end - # Name attribute - it "name must be unique" do + context "name" do + it "requires name" do + product = build :product, name: nil + product.valid? + expect(product.errors.keys).to include(:name) + end - expect(@product_b).to_not be_valid - expect(@product_b.errors.keys).to include(:name) + it "name must be unique" do + create :product + product = build :product + product.valid? + expect(product.errors.keys).to include(:name) + end end - # Price attribute - it "price is a decimal" do - expect(@product_a.price.class).to eq BigDecimal - end + context "price" do + it "requires price" do + product = build :product, price: nil + product.valid? + expect(product.errors.keys).to include(:price) + end - it "does not allow non-numeric input for price" do - product_c = Product.new( - name: "C product", - price: "bloop", - photo_url: "c_photo.jpg", - inventory: 22, - user_id: 2 - ) - expect(product_c).to_not be_valid - expect(product_c.errors.keys).to include(:price) - end + it "price is a decimal" do + product = build :product + expect(product.price.class).to eq BigDecimal + end - it "non-decimals are converted to decimals by adding .0" do - product_c = Product.new( - name: "C product", - price: 30, - photo_url: "c_photo.jpg", - inventory: 22, - user_id: 2 - ) - expect(product_c.price.to_s).to eq "30.0" - end + it "does not allow non-numeric input for price" do + product = build :product, price: "bloop" + product.valid? + expect(product.errors.messages).to eq(:price=>["is not a number"]) + end - it "price must be greater than 0" do - product_c = Product.new( - name: "C product", - price: -30.95, - photo_url: "c_photo.jpg", - inventory: 22, - user_id: 2 - ) - expect(product_c).to_not be_valid - expect(product_c.errors.keys).to include(:price) + it "non-decimals are converted to decimals by adding .0" do + product = build :product, price: 30 + expect(product.price).to eq 30.0 + end + + it "price must be greater than 0" do + product = build :product, price: -30.23 + product.valid? + expect(product.errors.keys).to include(:price) + end end - # Inventory attribute - invalid_inventories = [ -4, 4.53, "bloop" ] - it "does not allow invalid input for inventory" do - invalid_inventories.each do |value| - product = Product.new( - name: "a product", - price: 34.20, - photo_url: "c_photo.jpg", - inventory: value, - user_id: 2 - ) - expect(product).to_not be_valid + context "inventory" do + it "requires inventory" do + product = build :product, inventory: nil + product.valid? expect(product.errors.keys).to include(:inventory) end + + [-4, 4.53, "bloop"].each do |value| + it "does not validate #{value} for inventory" do + product = build :product, inventory: value + product.valid? + expect(product.errors.keys).to include(:inventory) + end + end + + it "inventory is a Fixnum" do + product = create :product + expect(product.inventory.class).to eq Fixnum + end end - it "inventory is a Fixnum" do - expect(@product_a.inventory.class).to eq Fixnum + context "weight and dimension attribute validations" do + before :each do + @product = build :product + end + weight_and_dimensions = [:weight_in_gms, :length_in_cms, :width_in_cms, :height_in_cms] + + weight_and_dimensions.each do |attribute| + it "#{attribute} can be a number" do + @product.valid? + expect(@product.errors.keys).to_not include attribute + end + end + + weight_and_dimensions.each do |attribute| + it "#{attribute} cannot be alphabetical" do + @product[attribute] = "hello" + @product.valid? + expect(@product.errors.keys).to include attribute + end + end end # OTHERS: @@ -111,139 +117,129 @@ # Scopes - WIP describe "scope" do before :each do - @product_b = Product.create( - name: "B product - different vendor", - price: 22.95, - photo_url: "b_photo.jpg", - inventory: 71, + @product_a = create :product, name: "B product - different vendor", user_id: 2 - ) - @product_c = Product.create( - name: "C product", - price: 30.00, - photo_url: "c_photo.jpg", - inventory: 13, - user_id: 1 - ) - - Product.create(name: "A product", price: 40.05, photo_url: "a_photo.jpg", inventory: 2, user_id: 2) - Product.create(name: "D product", price: 20.05, photo_url: "d_photo.jpg", inventory: 2, user_id: 2) - Product.create(name: "E product", price: 30.05, photo_url: "e_photo.jpg", inventory: 2, user_id: 2) - Product.create(name: "F product", price: 45.05, photo_url: "f_photo.jpg", inventory: 2, user_id: 2) - Product.create(name: "G product", price: 32.05, photo_url: "g_photo.jpg", inventory: 2, user_id: 2) - end - describe "#by_vendor" do - it "products can be sorted by User (vendor)" do - products = [@product_a, @product_c] - products.each do |product| - expect(Product.by_vendor(1)).to include(product) - end - expect(Product.by_vendor(1).count).to eq 2 - - expect(Product.by_vendor(2)).to include(@product_b) - expect(Product.by_vendor(2).count).to eq 1 - end + @product_b = create :product - it "by_vendor does not return false positives" do - expect(Product.by_vendor(1)).to_not include(@product_b) - expect(Product.by_vendor(2)).to_not include(@product_a) - end + create :product, name: "C product", user_id: 2 + create :product, name: "D product", user_id: 2 + create :product, name: "E product", user_id: 2 + create :product, name: "F product", user_id: 2 + create :product, name: "G product", user_id: 2 end - describe "#by_category" do - before :each do - @cat_a = Category.create(name: "Cat") - @cat_b = Category.create(name: "Dog") - @cat_c = Category.create(name: "Human") - - @product_a.categories << @cat_a - @product_b.categories << [@cat_b, @cat_a, @cat_c] - @product_c.categories << [@cat_a, @cat_c] - end - - it "categories can be added to a product" do - expect(@product_a.categories.count).to eq 1 - expect(@product_b.categories.count).to eq 3 - expect(@product_c.categories.count).to eq 2 - expect(@product_c.categories).to include(@cat_a) - end - - it "a product's categories includes only those assigned" do - expect(@product_a.categories).to_not include(@cat_c) - end - - it "products can be sorted by Category" do - expect(Product.by_category(@cat_a).count).to eq 3 - expect(Product.by_category(@cat_a)).to include(@product_a) - - expect(Product.by_category(@cat_b).count).to eq 1 - expect(Product.by_category(@cat_b)).to include(@product_b) + describe "#by_vendor" do + # it "products can be sorted by User (vendor)" do + # products = [@product_a, @product_c] + # products.each do |product| + # expect(Product.by_vendor(1)).to include(product) + # end + # expect(Product.by_vendor(1).count).to eq 2 - expect(Product.by_category(@cat_c).count).to eq 2 - expect(Product.by_category(@cat_c)).to include(@product_c) - end + # expect(Product.by_vendor(2)).to include(@product_b) + # expect(Product.by_vendor(2).count).to eq 1 + # end - it "by_category scope does not return false positives" do - expect(Product.by_category(@cat_b)).to_not include(@product_a) - expect(Product.by_category(@cat_c)).to_not include(@product_a) + it "by_vendor does not return false positives" do + expect(Product.by_vendor(1)).to_not include(@product_a) + expect(Product.by_vendor(2)).to_not include(@product_b) end end - describe "#top_5" do - before :each do - @product_ids = [] - Product.all.each do |product| - @product_ids << product.id - end - - 20.times do - OrderItem.create(quantity: 1, order_id: 1, product_id: @product_ids.sample) - end - - @order_items = OrderItem.where(order_id: 1).to_a - @output = Product.top_5(@order_items) - end - - it "takes only one argument" do - expect { Product.top_5() }.to raise_error ArgumentError - expect { Product.top_5(@order_items, 5) }.to raise_error ArgumentError - expect { Product.top_5(@order_items) }.to_not raise_error - end - - # I tried, but I just ended up rewriting the scope - - # it "selects the most popular products" do - # product1 = @order_items.map { |item| item if item.product_id == 1 } - # product2 = @order_items.map { |item| item if item.product_id == 2 } - # product3 = @order_items.map { |item| item if item.product_id == 3 } - # product4 = @order_items.map { |item| item if item.product_id == 4 } - # product5 = @order_items.map { |item| item if item.product_id == 5 } - # product6 = @order_items.map { |item| item if item.product_id == 6 } - # product7 = @order_items.map { |item| item if item.product_id == 7 } - # product_sales = [product1, product2, product3, product4, product5, product6, product7] - # - # least_popular = product_sales.min_by(2) { |sales| sales.count} - # print least_popular - # unpopular_products = [] - # least_popular.each do |items| - # unpopular_products << Product.find(items[0].product_id) - # end - # - # expect(@output).to_not include unpopular_products[0] - # expect(@output).to_not include unpopular_products[1] - # end - - it "returns an array of Product objects" do - expect(@output.class).to be Array - @output.each do |element| - expect(element.class).to be Product - end - end + # describe "#by_category" do + # before :each do + # @cat_a = Category.create(name: "Cat") + # @cat_b = Category.create(name: "Dog") + # @cat_c = Category.create(name: "Human") + + # @product_a.categories << @cat_a + # @product_b.categories << [@cat_b, @cat_a, @cat_c] + # @product_c.categories << [@cat_a, @cat_c] + # end + + # it "categories can be added to a product" do + # expect(@product_a.categories.count).to eq 1 + # expect(@product_b.categories.count).to eq 3 + # expect(@product_c.categories.count).to eq 2 + # expect(@product_c.categories).to include(@cat_a) + # end + + # it "a product's categories includes only those assigned" do + # expect(@product_a.categories).to_not include(@cat_c) + # end + + # it "products can be sorted by Category" do + # expect(Product.by_category(@cat_a).count).to eq 3 + # expect(Product.by_category(@cat_a)).to include(@product_a) + + # expect(Product.by_category(@cat_b).count).to eq 1 + # expect(Product.by_category(@cat_b)).to include(@product_b) + + # expect(Product.by_category(@cat_c).count).to eq 2 + # expect(Product.by_category(@cat_c)).to include(@product_c) + # end + + # it "by_category scope does not return false positives" do + # expect(Product.by_category(@cat_b)).to_not include(@product_a) + # expect(Product.by_category(@cat_c)).to_not include(@product_a) + # end + # end - it "returns 5 objects (inside an Array)" do - expect(@output.count).to eq 5 - end - end + # describe "#top_5" do + # before :each do + # @product_ids = [] + # Product.all.each do |product| + # @product_ids << product.id + # end + + # 20.times do + # OrderItem.create(quantity: 1, order_id: 1, product_id: @product_ids.sample) + # end + + # @order_items = OrderItem.where(order_id: 1).to_a + # @output = Product.top_5(@order_items) + # end + + # it "takes only one argument" do + # expect { Product.top_5() }.to raise_error ArgumentError + # expect { Product.top_5(@order_items, 5) }.to raise_error ArgumentError + # expect { Product.top_5(@order_items) }.to_not raise_error + # end + + # # I tried, but I just ended up rewriting the scope + + # # it "selects the most popular products" do + # # product1 = @order_items.map { |item| item if item.product_id == 1 } + # # product2 = @order_items.map { |item| item if item.product_id == 2 } + # # product3 = @order_items.map { |item| item if item.product_id == 3 } + # # product4 = @order_items.map { |item| item if item.product_id == 4 } + # # product5 = @order_items.map { |item| item if item.product_id == 5 } + # # product6 = @order_items.map { |item| item if item.product_id == 6 } + # # product7 = @order_items.map { |item| item if item.product_id == 7 } + # # product_sales = [product1, product2, product3, product4, product5, product6, product7] + # # + # # least_popular = product_sales.min_by(2) { |sales| sales.count} + # # print least_popular + # # unpopular_products = [] + # # least_popular.each do |items| + # # unpopular_products << Product.find(items[0].product_id) + # # end + # # + # # expect(@output).to_not include unpopular_products[0] + # # expect(@output).to_not include unpopular_products[1] + # # end + + # it "returns an array of Product objects" do + # expect(@output.class).to be Array + # @output.each do |element| + # expect(element.class).to be Product + # end + # end + + # it "returns 5 objects (inside an Array)" do + # expect(@output.count).to eq 5 + # end + # end end end diff --git a/spec/models/review_spec.rb b/spec/models/review_spec.rb index 86ac6845..b40ea227 100644 --- a/spec/models/review_spec.rb +++ b/spec/models/review_spec.rb @@ -1,62 +1,43 @@ require 'rails_helper' -# These RSpecs are not DRY at all. :( RSpec.describe Review, type: :model do - describe "model validations:" do - let(:review) { Review.new } - - context "rating" do - it "is required" do - expect(review).to_not be_valid + describe "model validations" do + context "rating validations" do + it "requires rating" do + review = build :review, rating: nil + review.valid? expect(review.errors.keys).to include(:rating) end - ["one", 0.0, 4.5, nil].each do |invalid_rating| - it "required to be an integer" do - invalid_review = review - invalid_review.attributes = { - rating: invalid_rating, - description: "Tests", - product_id: 1 - } - - expect(invalid_review).to_not be_valid + ["one", 0.0, 4.5].each do |rating| + it "requires rating to be an integer, does not validate #{rating}" do + invalid_review = build :review, rating: rating + invalid_review.valid? expect(invalid_review.errors.keys).to include(:rating) end end - [-5, -1, 0, 6].each do |invalid_rating| - it "required to be 1 - 5" do - invalid_review = review - invalid_review.attributes = { - rating: invalid_rating, - description: "Tests", - product_id: 1 - } - - expect(invalid_review).to_not be_valid + [-1, 0, 6].each do |rating| + it "requires rating to be between 1 - 5, does not validate #{rating}" do + invalid_review = build :review, rating: rating + invalid_review.valid? expect(invalid_review.errors.keys).to include(:rating) end end end - context "product_id" do - it "required" do - expect(review).to_not be_valid + context "product_id validations" do + it "requires product_id" do + review = build :review, product_id: nil + review.valid? expect(review.errors.keys).to include(:product_id) end - ["one", 0.0, 4.5, nil].each do |invalid_id| - it "required to be an integer" do - invalid_review = review - invalid_review.attributes = { - rating: invalid_id, - description: "Tests", - product_id: 1 - } - - expect(invalid_review).to_not be_valid + ["one", 0.0, 4.5].each do |id| + it "requires product_id to be an integer, does not validate #{id}" do + invalid_review = build :review, rating: id + invalid_review.valid? expect(invalid_review.errors.keys).to include(:rating) end end @@ -65,7 +46,7 @@ context "scopes" do before :each do rating = ["3", "2", "4", "5", "1"] - rating.each { |rate| Review.create!(rating: rate, product_id: 1) } + rating.each { |rate| create :review, rating: rate } end it "ratings_by_1" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 8701f8c3..dc228466 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,40 +2,71 @@ RSpec.describe User, type: :model do describe "model validations" do - context "username validations" do - it "requires a username" do - user = User.new(email: "an_email.com", password: "password", password_confirmation: "password") - expect(user).to_not be_valid - expect(user.errors.keys).to include(:username) - end + it "requires a username" do + user = build :user, username: nil + user.valid? + expect(user.errors.keys).to include(:username) end context "email validations" do - it "requires the presence of an email" do - user = User.new - expect(user).to_not be_valid + it "requires an email" do + user = build :user, email: nil + user.valid? expect(user.errors.keys).to include(:email) end it "requires an email to include '@' and '.'" do - user = User.new(username: "aname", email: "something.com", password: "password", password_confirmation: "password") - expect(user).to_not be_valid - expect(user.errors.keys).to include(:email) + user = build :user, email: "hello" + user.valid? + expect(user.errors.messages).to eq(:email => ["is invalid"]) end end context "password validations" do it "requires a password" do - user = User.new - expect(user).to_not be_valid + user = build :user, password: nil + user.valid? expect(user.errors.keys).to include(:password) end it "requires the password and password confirmation to match" do - user = User.new(username: "a_name", email: "hi@email.com", password: "password", password_confirmation: "uhduh") - expect(user).to_not be_valid - expect(user.errors.keys).to include(:password_confirmation) + user = build :user, password_confirmation: "hello" + user.valid? + expect(user.errors.messages).to eq(:password_confirmation => + ["doesn't match Password", "doesn't match Password"]) end end + + it "requires a city" do + user = build :user, city: nil + user.valid? + expect(user.errors.keys).to include(:city) + end + + it "requires a state" do + user = build :user, state: nil + user.valid? + expect(user.errors.keys).to include(:state) + end + + context "zip validations" do + it "requires a zip" do + user = build :user, zip: nil + user.valid? + expect(user.errors.keys).to include(:zip) + end + + it "requires zip to be a number" do + user = build :user, zip: "abc" + user.valid? + expect(user.errors.messages).to eq(:zip => ["is not a number"]) + end + end + + it "requires a country" do + user = build :user, country: nil + user.valid? + expect(user.errors.keys).to include(:country) + end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 45225a75..e2263f45 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +require 'factory_girl' require "simplecov" require "rails_helper" @@ -24,6 +25,8 @@ # # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| + config.include FactoryGirl::Syntax::Methods + config.include Rails.application.routes.url_helpers Dir["./spec/support/**/*.rb"].sort.each { |f| require f} # rspec-expectations config goes here. You can use an alternate diff --git a/spec/support/controller_destroy_action.rb b/spec/support/controller_destroy_action.rb index cf0f10a8..4b74001b 100644 --- a/spec/support/controller_destroy_action.rb +++ b/spec/support/controller_destroy_action.rb @@ -7,7 +7,8 @@ before :each do @object = described_class.model.create(params) - @user = User.create(username: "user", email: "email@email.com", password: "heloo", password_confirmation: "heloo") + @user = User.create(username: "user", email: "email@email.com", password: "heloo", password_confirmation: "heloo", + city: "Seattle", state: "WA", zip: 98101, country: "US") session[session_key] = 1 end diff --git a/spec/support/create_controller_spec.rb b/spec/support/create_controller_spec.rb index faf4171e..17dbdd19 100644 --- a/spec/support/create_controller_spec.rb +++ b/spec/support/create_controller_spec.rb @@ -10,7 +10,11 @@ username: "Logged In", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) session[:user_id] = 1 end diff --git a/spec/support/new_controller_spec.rb b/spec/support/new_controller_spec.rb index ee900d3d..21db6a97 100644 --- a/spec/support/new_controller_spec.rb +++ b/spec/support/new_controller_spec.rb @@ -10,7 +10,11 @@ username: "Logged In", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) session[:user_id] = 1 end diff --git a/spec/support/show_controller_spec.rb b/spec/support/show_controller_spec.rb index 348e31a6..aa8f3f7a 100644 --- a/spec/support/show_controller_spec.rb +++ b/spec/support/show_controller_spec.rb @@ -12,7 +12,11 @@ username: "Test", email: "test@test.com", password: "test", - password_confirmation: "test" + password_confirmation: "test", + city: "Seattle", + state: "WA", + zip: 98101, + country: "US" ) session[:user_id] = 1 end