+ + Product Categories + + + + <% @all_categories.each do | category | %> + + <%= link_to(image_tag(category.photo_url, class:"category-img-thumbnail"), category_path(category.id))%> + <%= link_to category.name, category_path(category.id), class: "product-categories-link increase-font2" %> + + <% end %> + +
+ + Add a New Category + + + + <%= render partial: "form", locals: { submit_url: categories_path, http_method: :post } %> + + + Don't want to add a category, <%= link_to "Go to All Categories", categories_path %> +
+ + <%= @category.name %> + + + + <%= link_to "#{image_tag(@category.photo_url)}".html_safe, category_path, class: "category-img" %> + + + + <% @products_by_category.each do | product | %> + + <%= link_to(image_tag(product.photo_url, class:"category-img-thumbnail"), product_path(product.id)) %> + <%= link_to product.name, product_path(product.id), class: "product-link increase-font2" %> + + <% end %> + +
+ + This page doesn't belong to you. + + <%= link_to "Go Back to Your Merchant Portal", merchant_path(@current_user.id) %> + +
+ + <%= link_to "Merchants", merchants_path %> + <%= link_to "Products", products_path %> + <%= link_to "Categories", categories_path %> + +
+ + <% @merchants.each do |merchant| %> + + <%= link_to "#{merchant.name}", merchant_path(merchant) %> + + <% end %> + + + + + <%= image_tag "merchant-strawberries.jpg", class: "merchant-img" %> + + +
+ + <%= @merchant.name %> + + + <% if @user_page == true %> + + <%= "Welcome to your Merchant Page, #{@merchant.name}." %> + + + + Total Revenue: (<%= money_format(@cumulative_revenue) %>) + <%= link_to "Add a new product", new_merchant_product_path(@merchant), class: "button" %> + + <% end %> + + + <% @merchant.products.each do |product| %> + <% if product.orders.length > 0 %> + + + <%= link_to "#{product.name} (qty: #{product.stock_quantity})", product_path(product), class: "increase-font" %> + <%= link_to(image_tag("#{product.photo_url}", class: "merchant-img-thumbnail"), product_path(product)) %> + + + + <% if @user_page == true %> + <%= link_to "Edit", edit_product_path(product), class: "button" %> + <%= link_to "Retire Product", product_retired_path(product), class: "alert button" %> + <% end %> + + <% if @user_page == true %> + + Order Date + Order Number + Customer + Order Status + Order Details + + + <% product.orders.reverse.each do |order| %> + + + <% if order.status != 'pending' %> + <%=order.purchase_time.strftime("%Y-%m-%d")%> + <% else %> + N/A + <% end %> + <%=order.id%> + <%=order.name%> + <%=order.status%> + <%= link_to "View", order_path(order) %> + + + + <% end %> + <% end %> + + + <% else %> + + + <%= link_to "#{product.name} (qty: #{product.stock_quantity})", product_path(product), class: "increase-font" %> + <%= link_to(image_tag("#{product.photo_url}", class: "merchant-img-thumbnail"), product_path(product)) %> + + + + <% if @user_page == true %> + <%= link_to "Edit", edit_product_path(product), class: "button"%> + <%= link_to "Retire Product", product_retired_path(product), class: "alert button" %> + <% end %> + + <% end %> + <% end %> + diff --git a/app/views/orders/_order_info.html.erb b/app/views/orders/_order_info.html.erb new file mode 100644 index 0000000000..d0495456e6 --- /dev/null +++ b/app/views/orders/_order_info.html.erb @@ -0,0 +1,30 @@ +<% if @order.status != "pending" %> + + + + Customer Information: + + Email: + <%= @order.email %> + + + Mailing Address: + <%= @order.mailing_address %> + + + Name on Credit Card: + <%= @order.name %> + + + Last four digits of Credit Card: + + <%= sprintf '%04d' % @order.cc_last_4 %> + + + Credit Card Expiration Date: + + <%= @order.cc_expire %> + + + +<% end %> diff --git a/app/views/orders/checkout.html.erb b/app/views/orders/checkout.html.erb new file mode 100644 index 0000000000..1a24fd693e --- /dev/null +++ b/app/views/orders/checkout.html.erb @@ -0,0 +1,28 @@ + + + Checkout + +<%= @order.name%>, please complete the following information to complete your checkout. + +<%= form_for(@order, url: pay_for_order_path) do |f| %> + +<%= f.label :name %> +<%= f.text_field :name %> + +<%= f.label :email %> +<%= f.text_field :email %> + +<%= f.label :mailing_address %> +<%= f.text_field :mailing_address %> + +<%= f.label :cc_last_4%> +<%= f.text_field :cc_last_4 %> + +<%= f.label :cc_expire %> +<%= f.text_field :cc_expire %> + +<%= f.hidden_field :status, :value => "paid" %> + + <%= f.submit "Complete Order" %> +<% end %> + diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..a1a72a6655 --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,60 @@ + + + Order Page for <%= @order.name%> + + + <%if flash[:notice]%> + <%= flash[:notice] %> + <%end%> + + +<% if @order.status == "pending" %> + + + <%= button_to "Checkout", checkout_path(@order.id), method: :get %> + +<% end %> + +<%= render partial: "order_info" %> + + + + + Order Information: + + Product Item + Quantity + Price per Item + Total + Associated Merchant + Shipped? + + <% @order_items.each do |item| %> + + + <%= Product.find(item.product_id).name%> + <%= item.quantity%> + <%= money_format(Product.find(item.product_id).price)%> + <%= money_format(Product.find(item.product_id).price * item.quantity)%> + <%= Product.find(item.product_id).merchant_id%> + + <%= item.shipping_status%> + <% if @current_user == Product.find(item.product_id).merchant_id %> + <%= button_to "ship this product", some_path %> + <% end %> + + + <% end %> + + + Grand Total:<%= money_format(@total_revenue) %> + + +<% @order_items.each do |item| %> + <% if @order.id == item.order_id %> + Merchant_id: <%=(item.product.merchant_id) %>Product_id: <%= item.product_id %> Order_id <%= item.order_id %> + <% end %> +<% end %> + + + diff --git a/app/views/product_categories/_form.html.erb b/app/views/product_categories/_form.html.erb new file mode 100644 index 0000000000..2cd2296074 --- /dev/null +++ b/app/views/product_categories/_form.html.erb @@ -0,0 +1,23 @@ +<% if @product_category.errors.any? %> + + <% @product_category.errors.each do |column, message| %> + + <%= column.capitalize %> <%= message %> + + <% end %> + +<% end %> + +<%= form_for @product_category, class: 'add-form', html: {class: 'form'}, url: submit_url,method: http_method do |f| %> + + <% @all_categories.each do | category | %> + <%= check_box_tag 'category_ids[]', category.id %> + <%= category.name %> + <% end %> + + + + <%= f.submit "Create", class: "button"%> + + +<% end %> diff --git a/app/views/product_categories/new.html.erb b/app/views/product_categories/new.html.erb new file mode 100644 index 0000000000..7ee8713ca6 --- /dev/null +++ b/app/views/product_categories/new.html.erb @@ -0,0 +1,9 @@ + + + Select all of the Categories that your Product belongs to: + + + + <%= render partial: "form", locals: { submit_url: product_product_categories_path, http_method: :post } %> + + diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb new file mode 100644 index 0000000000..3fbaf0962a --- /dev/null +++ b/app/views/products/_form.html.erb @@ -0,0 +1,41 @@ +<% if @product.errors.any? %> + + <% @product.errors.each do |column, message| %> + + <%= column.capitalize %> <%= message %> + + <% end %> + +<% end %> + +<%= form_for [@merchant, @product], method: http_method do |f| %> + + <%= f.label "Product Name" %> + <%= f.text_field :name %> + + + + <%= f.label "Product Description" %> + <%= f.text_field :description %> + + + + <%= f.label "Photo (URL)" %> + <%= f.text_field :photo_url %> + + + + <%= f.label :price %> + <%= f.text_field :price %> + + + + <%= f.label "Quantity Available" %> + <%= f.text_field :stock_quantity %> + + + + <%= f.submit "Submit", class: "button" %> + + +<% end %> diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb new file mode 100644 index 0000000000..af1cdb5763 --- /dev/null +++ b/app/views/products/edit.html.erb @@ -0,0 +1,7 @@ + + + + Hi, <%= @current_user.name %>! You're editing <%= @product.name %> ! + + <%= render partial: "form", locals: { http_method: :patch } %> + diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..ea163834e1 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,21 @@ + + + + All the Products + <% if @merchant %> + for <%= @merchant.name %> + <% end %> + + + + + + <% @products.each do |product| %> + + <%= link_to(image_tag(product.photo_url, class:"product-img-thumbnail"), product_path(product)) %> + <%= link_to "#{product.name}", product_path(product), class: "product-link increase-font2" %> + + <% end %> + + + diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb new file mode 100644 index 0000000000..76a819cff9 --- /dev/null +++ b/app/views/products/new.html.erb @@ -0,0 +1,27 @@ + + + + Hi, <%= @current_user.name %>! You're making a new product! + + + + + Please add a category if you do not see an appropriate one for your product below: + <%= link_to "Add a Category", new_category_path, class: "button small-2 columns" %> + + + + + <% @all_categories.each do | category | %> + <%= category.name %> + <% end %> + + + + + + + + <%= render partial: "form", locals: { http_method: :post } %> + + diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..7714d2c4f3 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,64 @@ + + + + + <% if flash[:notice] %> + <%= flash[:notice] %> + <% end %> + + + + <%= @product.name %> + + + + + + <%= image_tag(@product.photo_url, class: "product-imgpadding-bot") %> + + + + Price + <%= money_format(@product.price) %> + + + <% if @product.stock_quantity > 0 %> + In Stock: + <%= @product.stock_quantity %> Available + <% else %> + OUT OF STOCK + <% end %> + + + Sold by: + <%= @product.merchant.name %> + + + Description: + <%= @product.description %> + + + Categories: + + <% @categories.each do |category| %> + <%= link_to category.name, category_path(category.id)%> + <% end %> + + + + + + <% if @user_page %> + + <%= link_to "Edit", edit_product_path(params[:id]), class:"product-button" %> + + <% else %> + <%= link_to "Reviews", product_reviews_path(params[:id]), class:"product-button" %> + <%= link_to "Add a Review", new_product_review_path(params[:id]), class:"product-button" %> + + <%= link_to "Add to Cart", product_orders_path(params[:id]), method: :post, class:"product-button" %> + <% end %> + + + + diff --git a/app/views/reviews/_form_stars.html.erb b/app/views/reviews/_form_stars.html.erb new file mode 100644 index 0000000000..1f06bcf1d0 --- /dev/null +++ b/app/views/reviews/_form_stars.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/views/reviews/index.html.erb b/app/views/reviews/index.html.erb new file mode 100644 index 0000000000..8d673fb684 --- /dev/null +++ b/app/views/reviews/index.html.erb @@ -0,0 +1,21 @@ + + + <%= "Reviews for #{@product.name}" %> + + + + + + <% @reviews_by_product.each do | review | %> + + <%= "#{review.title} (Rating: #{review.rating}):" %> + <%= "#{review.body}" %> + + + <% end %> + + + + <%= link_to "Add a Review", new_product_review_path(params[:product_id]), class: "product-button" %> + + diff --git a/app/views/reviews/new.html.erb b/app/views/reviews/new.html.erb new file mode 100644 index 0000000000..687133f412 --- /dev/null +++ b/app/views/reviews/new.html.erb @@ -0,0 +1,31 @@ + + + Add a Review + + + <% if @review.errors.any? %> + + <% @review.errors.each do |column, message| %> + + <%= column.capitalize %> <%= message %> + + <% end %> + + <% end %> + + <%= form_for @review, class: "", html: {class: 'form'}, url: product_reviews_path, http_method: :post do |f| %> + + + <%= f.label :title, 'Title:' %> + <%= f.text_field :title %> + + <%= f.label :rating, 'Rating:(1-5)' %> + <%= f.text_field :rating %> + + <%= f.label :body %> + <%= f.text_field :body %> + + <%= f.submit :class => 'button' %> + + <% end %> + diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb new file mode 100644 index 0000000000..bb45850f2b --- /dev/null +++ b/app/views/sessions/index.html.erb @@ -0,0 +1 @@ +sessions index diff --git a/app/views/sessions/login_failure.html.erb b/app/views/sessions/login_failure.html.erb new file mode 100644 index 0000000000..e9a9c14d80 --- /dev/null +++ b/app/views/sessions/login_failure.html.erb @@ -0,0 +1,7 @@ + + + Sorry, something went wrong with your login. Please click below to try again. + + + <%= link_to "Log In", "/auth/google" %> + diff --git a/bin/spring b/bin/spring index 7fe232c3aa..9bc076b9ea 100755 --- a/bin/spring +++ b/bin/spring @@ -7,9 +7,10 @@ unless defined?(Spring) require 'rubygems' require 'bundler' - if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) - Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) } - gem 'spring', match[1] + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + if spring = lockfile.specs.detect { |spec| spec.name == "spring" } + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version require 'spring/binstub' end end diff --git a/config/database.yml b/config/database.yml index 04f24be2ba..1c1a37ca8d 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,85 +1,25 @@ -# PostgreSQL. Versions 8.2 and up are supported. +# SQLite version 3.x +# gem install sqlite3 # -# Install the pg driver: -# gem install pg -# On OS X with Homebrew: -# gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On OS X with MacPorts: -# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config -# On Windows: -# gem install pg -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -# -# Configure Using Gemfile -# gem 'pg' +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' # default: &default - adapter: postgresql - encoding: unicode - # For details on connection pooling, see rails configuration guide - # http://guides.rubyonrails.org/configuring.html#database-pooling + adapter: sqlite3 pool: 5 + timeout: 5000 development: <<: *default - database: betsy_development - - # The specified database role being used to connect to postgres. - # To create additional roles in postgres see `$ createuser --help`. - # When left blank, postgres will use the default role. This is - # the same name as the operating system user that initialized the database. - #username: betsy - - # The password associated with the postgres role (username). - #password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - - # The TCP port the server listens on. Defaults to 5432. - # If your server runs on a different port number, change accordingly. - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # Defaults to warning. - #min_messages: notice + database: db/development.sqlite3 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: betsy_test + database: db/test.sqlite3 -# As with config/secrets.yml, you never want to store sensitive information, -# like your database password, in your source code. If your source code is -# ever seen by anyone, they now have access to your database. -# -# Instead, provide the password as a unix environment variable when you boot -# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full rundown on how to provide these environment variables in a -# production deployment. -# -# On Heroku and other platform providers, you may have a full connection URL -# available as an environment variable. For example: -# -# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" -# -# You can use this database configuration with: -# -# production: -# url: <%= ENV['DATABASE_URL'] %> -# production: <<: *default - database: betsy_production - username: betsy - password: <%= ENV['BETSY_DATABASE_PASSWORD'] %> + database: db/production.sqlite3 diff --git a/config/environments/production.rb b/config/environments/production.rb index 5c1b32e486..01c624345f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -3,6 +3,10 @@ # Code is not reloaded between requests. config.cache_classes = true + config.serve_static_assets = true + config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' + + # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers @@ -29,7 +33,7 @@ # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # Asset digests allow you to set far-future HTTP expiration dates on all assets, # yet still be able to expire them through the digest params. diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000000..4dac3bf16c --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,14 @@ + # provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" + # provider :google, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email" + + Rails.application.config.middleware.use OmniAuth::Builder do + provider :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"], + { + :name => "google", + :scope => "email, profile", + # :prompt => "select_account", + :image_aspect_ratio => "square", + :image_size => 50, + :skip_jwt => true + } +end diff --git a/config/routes.rb b/config/routes.rb index 3f66539d54..33af1e8ac7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,47 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end + + root 'main#index' + + get "/auth/:provider/callback" => "sessions#create" + + get "/sessions/login_failure", to: "sessions#login_failure", as: "login_failure" + get "/sessions", to: "sessions#index", as: "sessions" + delete "/sessions", to: "sessions#destroy" + + resources :merchants, except: [:destroy] do + resources :products, only: [:new, :create, :index] + end + #add non-restful route orders where merchant id + + resources :products, except: [:new, :create, :destroy] do + resources :reviews, except: [:update, :destroy, :edit] + resources :product_categories, only: [:new, :create] + resources :orders, only: [:create, :update] + resources :order_items, only: [:create] + end + patch 'products/:id/retired', to: 'products#retired', as: 'product_retired' + + + resources :categories, except: [:destroy, :edit, :update] + + # resources :orders, except: [:destroy, :index, :new, :create, :update] + resources :orders, only: [:show, :edit] + + get 'orders/:id/checkout', to: 'orders#checkout', as: 'checkout' + patch 'orders/:id/pay', to: 'orders#pay', as: 'pay_for_order' + + # post 'products/:id/orders', to: 'orders#create' + + patch 'orders/:id/completed', to: 'orders#completed', as: 'order_completed' + patch 'orders/:id/cancelled', to: 'orders#cancelled', as: 'order_cancelled' + patch 'orders/:id/paid', to: 'orders#paid', as: 'order_paid' + + + # RELATIONSHIP TABLE ROUTES + resources :order_items, only: [:destroy, :update] + patch 'order_items/:id/shipped', to: 'order_items#shipped', as: 'order_items_shipped' + + + + end diff --git a/config/secrets.yml b/config/secrets.yml index 6442868fc1..b5398f4c2d 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -11,10 +11,10 @@ # if you're sharing your code publicly. development: - secret_key_base: eaebee6b0ce07b1e5b22743dacf6e6aaec01bf01c88370f9f86c3ae0d8592b4313c5e9da09754cd613eda8d206168bd74d5ed9910230b3957725352c70e2cf80 + secret_key_base: 797788a7d548970228544355b6b2bca444c1090f0e4b790e2b042a29f14aa19e09fe16fe70ab4f8a195fb3f32d073a92c7e084363e024d69b7304337af3d0524 test: - secret_key_base: f9c5bd6c383573755e5f8cf214402a51eb5ce8c7d0df9860dbf980f03fbd6c508e97412644b6a80d7034774602b05e05988bf7ab8ff594912950fdb590589a4d + secret_key_base: 05b285fa9c7a5144eab32f559f51e8f861a351626add1f4050ac8be190ea5c700d7b4316bbc390f20ca5901d6ce6867894e99eb12260da2b27d9150cb26dee26 # Do not keep production secrets in the repository, # instead read values from the environment. diff --git a/db/migrate/20161019210038_create_categories.rb b/db/migrate/20161019210038_create_categories.rb new file mode 100644 index 0000000000..9ac8ca0166 --- /dev/null +++ b/db/migrate/20161019210038_create_categories.rb @@ -0,0 +1,11 @@ +class CreateCategories < ActiveRecord::Migration + def change + create_table :categories do |t| + t.string :name + t.string :description + t.string :photo_url + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210201_create_merchants.rb b/db/migrate/20161019210201_create_merchants.rb new file mode 100644 index 0000000000..5acaaec25f --- /dev/null +++ b/db/migrate/20161019210201_create_merchants.rb @@ -0,0 +1,10 @@ +class CreateMerchants < ActiveRecord::Migration + def change + create_table :merchants do |t| + t.string :name + t.string :email + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210300_create_order_items.rb b/db/migrate/20161019210300_create_order_items.rb new file mode 100644 index 0000000000..fd43d27aab --- /dev/null +++ b/db/migrate/20161019210300_create_order_items.rb @@ -0,0 +1,12 @@ +class CreateOrderItems < ActiveRecord::Migration + def change + create_table :order_items do |t| + t.belongs_to :order, index: true + t.belongs_to :product, index: true + t.integer :quantity + t.boolean :shipping_status, :default => false + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210413_create_orders.rb b/db/migrate/20161019210413_create_orders.rb new file mode 100644 index 0000000000..17c53537fc --- /dev/null +++ b/db/migrate/20161019210413_create_orders.rb @@ -0,0 +1,15 @@ +class CreateOrders < ActiveRecord::Migration + def change + create_table :orders do |t| + t.string :name + t.string :email + t.string :mailing_address + t.string :cc_last_4 #We can validate this as four number digits + t.date :cc_expire + t.datetime :purchase_time + t.string :status + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210530_create_product_categories.rb b/db/migrate/20161019210530_create_product_categories.rb new file mode 100644 index 0000000000..18a63580fa --- /dev/null +++ b/db/migrate/20161019210530_create_product_categories.rb @@ -0,0 +1,10 @@ +class CreateProductCategories < ActiveRecord::Migration + def change + create_table :product_categories do |t| + t.belongs_to :product, index: true + t.belongs_to :category, index: true + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210628_create_products.rb b/db/migrate/20161019210628_create_products.rb new file mode 100644 index 0000000000..fb64387ce8 --- /dev/null +++ b/db/migrate/20161019210628_create_products.rb @@ -0,0 +1,15 @@ +class CreateProducts < ActiveRecord::Migration + def change + create_table :products do |t| + t.string :name + t.integer :price + t.integer :stock_quantity + t.string :description + t.string :photo_url + + t.belongs_to :merchant, index: true + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161019210922_create_reviews.rb b/db/migrate/20161019210922_create_reviews.rb new file mode 100644 index 0000000000..404a90f513 --- /dev/null +++ b/db/migrate/20161019210922_create_reviews.rb @@ -0,0 +1,13 @@ +class CreateReviews < ActiveRecord::Migration + def change + create_table :reviews do |t| + t.integer :rating + t.string :title + t.string :body + + t.belongs_to :product, index: true + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161022022550_add_uid_and_provider_column_to_merchant_table.rb b/db/migrate/20161022022550_add_uid_and_provider_column_to_merchant_table.rb new file mode 100644 index 0000000000..88ea700d28 --- /dev/null +++ b/db/migrate/20161022022550_add_uid_and_provider_column_to_merchant_table.rb @@ -0,0 +1,6 @@ +class AddUidAndProviderColumnToMerchantTable < ActiveRecord::Migration + def change + add_column :merchants, :uid, :string #null: false # this is the identifier provided by Github + add_column :merchants, :provider, :string #null: false # this tells us who provided the identifier + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..6704a100b4 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,91 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20161022022550) do + + create_table "categories", force: :cascade do |t| + t.string "name" + t.string "description" + t.string "photo_url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "merchants", force: :cascade do |t| + t.string "name" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "uid" + t.string "provider" + end + + create_table "order_items", force: :cascade do |t| + t.integer "order_id" + t.integer "product_id" + t.integer "quantity" + t.boolean "shipping_status", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "order_items", ["order_id"], name: "index_order_items_on_order_id" + add_index "order_items", ["product_id"], name: "index_order_items_on_product_id" + + create_table "orders", force: :cascade do |t| + t.string "name" + t.string "email" + t.string "mailing_address" + t.string "cc_last_4" + t.date "cc_expire" + t.datetime "purchase_time" + t.string "status" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "product_categories", force: :cascade do |t| + t.integer "product_id" + t.integer "category_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "product_categories", ["category_id"], name: "index_product_categories_on_category_id" + add_index "product_categories", ["product_id"], name: "index_product_categories_on_product_id" + + create_table "products", force: :cascade do |t| + t.string "name" + t.integer "price" + t.integer "stock_quantity" + t.string "description" + t.string "photo_url" + t.integer "merchant_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "products", ["merchant_id"], name: "index_products_on_merchant_id" + + create_table "reviews", force: :cascade do |t| + t.integer "rating" + t.string "title" + t.string "body" + t.integer "product_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "reviews", ["product_id"], name: "index_reviews_on_product_id" + +end diff --git a/db/seeds.rb b/db/seeds.rb index 4edb1e857e..7a83b000ed 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,44 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) +# We have validations for order requires that at least one order_item exists (and we do have the csv's set up correctly, but the order matters and fails to seed if we do them separately). +# We have validations on product that requires product_categories to exist (which also means that the csv's which are set up correctly, but can't be seeded independently.) Right now we're removing the validations so that the database seeds. If we have time we're going to consolidate them. +# Possibly use create! if we want to get an error on validations for our seed data, or we could turn off validations if we know that our seed data is valid. + +require 'csv' +# Merchant seed +CSV.read("seed_csvs/merchant.csv").each do |line| + id, name, email = line # parallel assignment! + id = id.to_i # need id to be a fixnum + merchant = Merchant.new(id: id.to_i, name: name, email: email) + +# This is how you would save without using validations + merchant.save(validate: false) +# Should maybe check here that all of our records got added. +end + +CSV.foreach('./seed_csvs/categories.csv', :headers => true) do |row| + Category.create(row.to_hash) +end + +CSV.read("seed_csvs/products.csv").each do |t| + product = Product.new(name: t[0], price: t[1], stock_quantity: t[2], description: t[3], photo_url: t[4], merchant_id: t[5]) + product.save(validate:false) +end + +CSV.foreach('./seed_csvs/orders.csv', :headers => true) do |row| + order = Order.create(row.to_hash) + order.save(validate:false) +end + +CSV.foreach('./seed_csvs/reviews.csv', :headers => true) do |row| + Review.create(row.to_hash) +end + + +# Order_Item +CSV.read("seed_csvs/order_items.csv").each do |t| + OrderItem.create(order_id: t[0], product_id: t[1], quantity: t[2]) +end + +#Product_Category +CSV.read("seed_csvs/product_categories.csv").each do |t| + ProductCategory.create(product_id: t[0], category_id: t[1]) +end diff --git a/seed_csvs/categories.csv b/seed_csvs/categories.csv new file mode 100644 index 0000000000..fd1277aa6f --- /dev/null +++ b/seed_csvs/categories.csv @@ -0,0 +1,6 @@ +name,description,photo_url +Wines,"From smooth light chardonnay to bold bodied cabernet's, our wine selection is top quality!","categories/wines.jpg" +Cheeses,"Smelly, soft, creamy, hard, flavored, etc. Looking for a type of Cheese, we've got you covered.","categories/cheese.jpg" +Stone Fruits and Nuts,Lovely seasoned nut varieties and stone fruits.,"categories/peaches.jpg" +Basket Essentials,Every essential picnic item you'll need for an amazing food experience outside of your home.,"categories/essentials.jpg" +Charcuterie,A cultured variety of cured meats from around the world.,"categories/charcuterie.jpg" diff --git a/seed_csvs/merchant.csv b/seed_csvs/merchant.csv new file mode 100644 index 0000000000..54b89f49ab --- /dev/null +++ b/seed_csvs/merchant.csv @@ -0,0 +1,10 @@ +1,"Karin's Cheese",karin@karinscheese.com +2,"Alma's Baked Goods",alma@mybakery.com +3,"Parker-Thiel",ptt@parkerthiel.com +4,"Baskets and More",mail@basketsandmore.com +5,"Sky's the Limit",skysales@gmail.com +6,"Maddie's Veggies",maddie@veggies.com +7,"Fancy Flatware",sales@fancyflatware.com +8,"Pickled Fancy",sales@pickles.com +9,"Best Blankets",kari@bestblankets.com +10,"Wine World",sales@wineworldandspirits.com diff --git a/seed_csvs/order_items.csv b/seed_csvs/order_items.csv new file mode 100644 index 0000000000..c6e6c97d52 --- /dev/null +++ b/seed_csvs/order_items.csv @@ -0,0 +1,12 @@ +1,4,2 +1,7,1 +1,19,2 +2,1,1 +3,7,3 +3,8,1 +4,16,1 +5,8,2 +6,15,1 +6,17,1 +6,18,1 +7,20,1 diff --git a/seed_csvs/orders.csv b/seed_csvs/orders.csv new file mode 100644 index 0000000000..6b4a6f79d8 --- /dev/null +++ b/seed_csvs/orders.csv @@ -0,0 +1,8 @@ +name,email,mailing_address,cc_last_4,cc_expire,purchase_time,status,cc_expire +Amber,ladida@adadev.com,"333 Skyhigh blvd, San Francisco, CA 93104",789,18-Feb,12:45 PM,paid,9-2020 +Anna,madie@adadev.com,"1234 Lily lane, Seattle, WA 90923",896,20-Mar,1:33 AM,paid,9-2020 +Shari,binks@adadev.com,"679 Sharari Dr, Skokie, New York 87654",984,22-Sep,3:10 PM,completed,9-2020 +Paul,pderryl@gmail.com,"333 duck pond lane, Seattle, WA 98105",234,16-Jul,7:45 PM,paid,9-2020 +Richard,rfiller@gmail.com,"234 dill drive, Pittsburg, Pa 87621",635,22-Nov,8:06 AM,completed,9-2020 +Tom,tomriddle@hogwarts.com,"1 darkarts dr., Burrow 12438",276,18-Mar,1:06 PM,pending,9-2020 +Ian,Ian@gmail.com,"5 Picnic Park Rd., Sunnyville, CA 94532",987,1/23/22,5:33 PM,cancelled,9-2020 diff --git a/seed_csvs/product_categories.csv b/seed_csvs/product_categories.csv new file mode 100644 index 0000000000..2cc8a7aaff --- /dev/null +++ b/seed_csvs/product_categories.csv @@ -0,0 +1,22 @@ +1,2 +2,2 +3,2 +4,5 +5,4 +6,4 +7,3 +8,4 +9,4 +10,3 +11,5 +12,5 +13,5 +14,4 +15,5 +16,3 +17,3 +17,4 +18,1 +19,1 +20,1 +20,4 diff --git a/seed_csvs/products.csv b/seed_csvs/products.csv new file mode 100644 index 0000000000..fbdb0d0231 --- /dev/null +++ b/seed_csvs/products.csv @@ -0,0 +1,20 @@ +"Groovy Gruyere",499,10,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","gruyere.jpg",1 +"Good-looking Goat",299,20,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","goat_cheese.jpeg",1 +"Breezy Brie",499,15,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","brie.jpg",2 +"Sagging Salami",699,15,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","salami.jpg",4 +"Bacciferous Basket",7500,7,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","basket.jpg",4 +"Blase Blanket",2000,20,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","blanket.jpg",4 +"Grecian Grapes",700,13,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","grapes.jpg",5 +"Cheap Cheese Slicer",800,15,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","slicer.jpeg",7 +"Saggy Sampler",2000,6,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","sampler.jpg",8 +"Almost Almonds",900,25,"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in enim dapibus, volutpat ex tempus, gravida lacus. Vivamus mattis sagittis odio, eu ornare lorem posuere in. Vivamus viverra odio ex, vel laoreet mi facilisis ut.","almonds.jpg",8 +Prociutto,1600,35,"The quality of prosciutto is entirely in how it's cured. The outside of the ham is usually rubbed with just salt and sometimes a mix of spices. This draws out moisture and concentrates the flavor while the ham slowly air-dries (very much like dry-aged beef). This process can take anywhere from a few months to a several years depending on the desired result.","http://f.tqn.com/y/foodreference/1/W/y/3/-/-/182025119.jpg",1 +Chorizo,1500,25,"Garlic, salt, herbs and other seasonings are then added, perhaps with a little white wine to speed the natural fermentation process. It then rests for two days. This curing gives chorizo its typical slightly acidic taste. Finally, they are then tied and hung up to dry.","http://assets.epicurious.com/photos/57aa23ebde966cd27ad74903/2:1/w_1260,h_630/chorizo.jpg",2 +Rosemary Pork And Chicken Terrine,1800,20,"And to think that the general public thinks that liver pâté is to be enjoyed in moderation! Our little secret is that we perfectly know that those pâtés are full of healthy saturated animal fats. A classic recipe, this pâté is distinctive for the pastis used in the recipe, and the generous blanket of whole fennel seeds on the top. ","https://s-media-cache-ak0.pinimg.com/originals/34/3a/8d/343a8d090f962842487d1811aedecdb0.jpg",3 +Siberian Sturgeon Caviar,8000,10,"We offer the finest caviar raised through sustainable means, comparable to the wild stocks of the Caspian Sea.","http://caviar.com/wp-content/uploads/caviar-siberian-sturgeon-1.jpg",4 +Picnic Meatballs,1000,100,"Deliciously perfect meatballs, drilled round and bite size for your picnic basket.","http://maximizedliving.com/wp-content/uploads/2011/09/swedish-meatballs.jpg",5 +Moroccan Olives,800,50,"The color of an olive indicates the stage of ripeness at which it was picked. Green olives are olives picked before they are ripe, usually in September or October. They should have a firm texture and nutty flavor. What we refer to as 'black' olives actually run the gamut from light brown, to beautiful shades of red and purple, all to way to deepest black. Moroccan olives are a deep dark red, almost sweet in flavor.","http://epicureandculture.com/wp-content/uploads/2015/12/olives.jpg",6 +Popcorn,300,50,"Corn. Yellow and tall. Harvested at its prime and prepared for popping. Stored in bags of latest quality to ensure maximum freshness for your picnic eats.","http://www.whatwillyoustore.com/wp-content/uploads/2016/01/Popcorn-Bucket.jpg",7 +Sauternes,7000,20,"Sauternes is a French sweet wine from the Sauternais region of the Graves section in Bordeaux.","sauternes.jpg",8 +Madeira,4000,20,"Madeira is a fortified Portuguese wine made in the Madeira Islands. Madeira is produced in a variety of styles ranging from dry wines which can be consumed on their own as an aperitif, to sweet wines more usually consumed with dessert.","http://catavino.net/wp-content/uploads/2015/06/6755024641_847daf3b3e_b.jpg",9 +"Tovaritch! Premium Vodka",3000,20,"Gold rated. Incredibly pure and neutral on the nose with perfect refinement and subtlety. Soft and laser-precise on the palate with a seamless balance and great length of flavor. Velvety and mouth-filling in style.","https://s.thestreet.com/files/tsc/v2008/photos/all-pics/food/Tovaritch_inside-large.jpg",10 diff --git a/seed_csvs/reviews.csv b/seed_csvs/reviews.csv new file mode 100644 index 0000000000..aa45ee063b --- /dev/null +++ b/seed_csvs/reviews.csv @@ -0,0 +1,11 @@ +rating,title,body,product_id +4,Best Picnic Food EVER!!!,Souffl� topping toffee I love. Toffee I love pie marshmallow candy canes candy canes pastry jujubes topping. Cake halvah chocolate cake bonbon pastry cheesecake jujubes.,1 +2,cheese wasn't smelly enough,Candy gummi bears croissant fruitcake. Souffl� cake chocolate wafer souffl� oat cake. Toffee jelly beans gummi bears bonbon. Bear claw carrot cake oat cake.,3 +3,Perfect Travel Size!!!,I love pastry dessert lemon drops gummi bears sesame snaps. I love macaroon liquorice tootsie roll chupa chups lemon drops I love. Muffin wafer cake pastry fruitcake bonbon I love chocolate cake.,5 +2,Wouldn't buy again :(,carrot cake tootsie roll. Gummies apple pie tootsie roll lemon drops liquorice dessert pudding. Sweet caramels souffl� I love chocolate. Liquorice drag�e dessert.,10 +5,Highly Recommend,Candy gummi bears croissant fruitcake. Souffl� cake chocolate wafer souffl� oat cake. Toffee jelly beans gummi bears bonbon. Bear claw carrot cake oat cake.,9 +5,I love this Wine!!!,Oat cake marzipan gummi bears sugar plum I love I love sweet roll I love caramels. Gummi bears donut macaroon jelly beans jelly beans caramels I love I love. Cake I love tart chocolate cake I love gummies toffee gingerbread sesame snaps.,1 +4,Cheese Please!!!,lemon drops gummi bears sesame snaps. I love macaroon liquorice tootsie roll chupa chups lemon drops I love. Muffin wafer cake pastry fruitcake bonbon I love chocolate cake.,9 +5,Perfect Pairing,bears croissant fruitcake. Souffl� cake chocolate wafer souffl� oat cake. Toffee jelly beans gummi bears bonbon. Bear claw carrot cake oat cake.,11 +1,Broke after two uses,Oat cake chocolate cake carrot cake tootsie roll. Gummies apple pie tootsie roll lemon drops liquorice dessert pudding. Sweet caramels souffl� I love chocolate. Liquorice drag�e dessert.,15 +3,Not enough Flavor,gummi bears croissant fruitcake. Souffl� cake chocolate wafer souffl� oat cake. Toffee jelly beans gummi bears bonbon. Bear claw carrot cake oat cake.,3 diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb new file mode 100644 index 0000000000..d89ba3559c --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,57 @@ +require 'test_helper' + +class CategoriesControllerTest < ActionController::TestCase + setup do + @category = categories(:one) + end + + test "should get index" do + get :index + assert_response :success + # assert_not_nil assigns(:categories) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create category" do + session[:user_id] = merchants(:one).id + + post_params = { + name: "unique test", + photo_url: "www.test.org" + } + assert_difference('Category.count', 1) do + post :create, category: post_params + end + assert_redirected_to new_merchant_product_path(session[:user_id]) + end + + test "should show category" do + category = categories(:one) + get :show, { id: category.id } + assert_response :success + end + + test "should rescue error and redirect_to /errors/category_not_found" do + category = categories(:one) + category.id = 980 + + get :show, { id: category.id } + assert_redirected_to "/errors/category_not_found" + end + + test "should render :new if category isn't saved" do + post_params = { + name: "unique test", + } + assert_no_difference('Category.count') do + post :create, category: post_params + end + + assert_template :new + end + +end diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb new file mode 100644 index 0000000000..f42e54a3d5 --- /dev/null +++ b/test/controllers/main_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class MainControllerTest < ActionController::TestCase + test "should get the main page" do + get :index + assert_response :success + assert_template :index + end +end diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb new file mode 100644 index 0000000000..ad5c60192d --- /dev/null +++ b/test/controllers/merchants_controller_test.rb @@ -0,0 +1,17 @@ +require 'test_helper' + +class MerchantsControllerTest < ActionController::TestCase + +test "should get index" do + get :index + assert_response :success +end + +test "should get show" do + get :show, id: merchants(:one).id + assert_response :success +end + +# positive/negative create tests + +end diff --git a/test/controllers/order_items_controller_test.rb b/test/controllers/order_items_controller_test.rb new file mode 100644 index 0000000000..fb158170fe --- /dev/null +++ b/test/controllers/order_items_controller_test.rb @@ -0,0 +1,98 @@ +require 'test_helper' + +class OrderItemsControllerTest < ActionController::TestCase +# CREATE!!! + # test "should create a new OrderItem" do + # post_params = {product: products(:three), order: orders(:three_pending)} + # puts "#{post_params} >>>>>>>>>" + # post :create, post_params + # assert_response :redirect + # end + + # test "creating a new order_item should change the total number" do + # assert_difference 'OrderItem.count', 1 do + # post_params = {order_item: {product_id: products(:three).id, order_id: orders(:three_pending).id, quantity: 1 }} + # post :create, post_params + # end + # end + + +# +# test "should create a new order when one doesn't already exist" do +# # Create a new order with a new order_item +# order_count = Order.all.count.to_i +# +# needs_order = OrderItem.new(order_id:1, product_id:products(:two).id, quantity:1) +# needs_order.save +# new_order_count = Order.all.count +# assert_equal order_count + 1, new_order_count +# end +# # +# # # TO FIX ERROR - end of input error +# # test "should not create a new order if one already exists" do +# # # Order_Item with existing Order id should NOT create a new order. +# # new_order_count = Order.all.count +# # # Not sure why there is an error appearing on the next line, all parts are closed. +# # next_order = OrderItem.new(order_id:orders(one:).id, product_id:products(:two).id, quantity:1) +# # next_order.save +# # new_two = Order.all.count +# # assert_equal new_order_count, new_two +# # end +# # +# # #UPDATE - NOTE - A person should only be able to update the quatity because they shouldn't be able to change the order_id which is unqiue to them and if they want to change the product, they have to go to that product and put it in the order. +# +# # WHY IS THIS PASSING?!?! +# test "a person should be able to update the quantity" do +# order_item = OrderItem.find(order_items(:four).id) +# order_item.quantity = 3 +# assert order_item.valid? +# end +# # WHY IS THIS PASSING?!?! +# test "a person should not add more items to their cart than are available" do +# order_item = OrderItem.find(order_items(:four).id) +# order_item.quantity = 7 +# assert_raise "You may not add a quantity to the order that is greater than the stock quantity." +# end +# # +# # MAYBE THIS IS BETTER FOR ORDER? WHY ARE THEY PAYING FOR THE ITEM, NOT THE ORDER? +# # test "an order_item can't be updated once the order is paid for" do +# # order_item = OrderItem.find(order_items(:five).id) +# # order_item.quantity = 2 +# # #Did we want to flash this? +# # assert_not order_item.valid? +# # assert_raise "You can't update an item that has already been paid for" +# # end +# # +# # #DESTROY +# # test "should be able to call destroy" do +# # delete :destroy, {id: items(:four).id} +# # assert_response :redirect +# # end +# # +# # test "Deleting the order_item should remove it from the order" do +# # assert_difference 'OrderItem.count', -1 do +# # delete :destroy, {id: order_items(:four).id } +# # end +# # end +# # +# # test "An order_item may not be deleted if the order has been paid for already " do +# # order_item = OrderItem.find(order_items(:five).id) +# # order_item.destroy +# # #Did we want to flash this? +# # assert_raise "You can't delete an item that has already been paid for" +# # end +# # +# # test "Deleteing the last order_item from the order will cancel the order" do +# # assert_difference 'Order.count', -1 do +# # delete :destroy, {id: order_items(:one).id } +# # end +# # end +# # +# # #SHIPPED - Still need to think through the tests here. Right now, I see how this would change the order status but not sure all the implications of being shipped. +# # +# # test "Shipping an item will update the shippment status" do +# # +# # end +end +# # +# # # create update destroy shipped diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..df6e31be0d --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,132 @@ +require 'test_helper' + +class OrdersControllerTest < ActionController::TestCase + + test "should be able to create a new order" do + post_params = {product_id: products(:three).id} + post :create, post_params + assert_response :redirect + end + + test "creating a new order should increase the number of orders by 1" do + assert_difference 'Order.count', 1 do + post_params = {product_id: products(:three).id} + post :create, post_params + end + end + + test "A new order will have status 'pending'" do + # Fake a user + # session[:user_id] = merchants(:one).id + post_params = {product_id: products(:one).id} + post :create, post_params + order = Order.last + + assert_equal order.status, "pending" + end + + test "A new order will not be created if product is nil or has no stock" do + product = products(:one) + product[:stock_quantity] = 0 + order_count = Order.count + assert_equal order_count, Order.count do + post_params = {product_id: product.id} + post :create, post_params + end + end + + test "A new order will be created if a other current order is not an open (not yet cancelled or paid) order" do + # # @todo discuss how to test/implement this + # # The first order + # post_params = {product_id: products(:one).id} + # post :create, post_params + # # Closing the first order + # order_cancel = Order.all.last + # order_cancel[:status] = "cancelled" + # + # assert_not order_cancel.status? + # + # # The second order + # post_params = {product_id: products(:one).id} + # post :create, post_params + # + # order_paid = Order.all.last + # order_paid[:status] = "paid" + # + # assert_not order_paid.status? + end + +# UPDATE _____________________ # + + test "updating an order should redirect to the order page" do + session[:order_id] = orders(:one).id + order = orders(:one) + product_id = products(:one).id + post_params = {id: order.id, product_id: product_id} + post :update, post_params + + assert_response :redirect + end + + test "updating an order with a new product should add it to the existing order" do + session[:order_id] = orders(:one).id + order = orders(:one) + # contains product(:one) + + prod_id = products(:three).id + update_post_params = {id: order.id, product_id: prod_id} + post :update, update_post_params + + assert_equal OrderItem.last.product_id, prod_id + end + +# test "updating an order with a new product should only be possible when the order is 'pending'" do +# +# end + +# # WIP @todo This one seems to geniunly pick up a bug, added to TRELLO +# test "it will not create a new order while staying in the same session" do +# assert_difference('Order.count', 1) do +# post_params = {product_id: products(:three).id} +# post :create, post_params +# end +# puts "before #{Order.count} <<<<<<<" +# assert_no_difference('Order.count') do +# post_params = {product_id: products(:three).id} +# post :create, post_params +# puts "#{Order.count} <<<<<<<" +# +# assert_response :redirect +# # assert_not_nil session[:order_id] +# end +# end + +# test "should update the order when the order_item changes" do +# end +# + +test "should get show" do + get :show, id: orders(:one).id + assert_response :success +end + +test "should get checkout" do + get :checkout, id: orders(:one).id + assert_response :success +end +# +# # Return to non-restful routes. +# test "an order is marked completed when all items in the order have been shipped" do +# +# end +# +# test "an order is cancelled when the session ends before being paid for" do +# +# end +# +# test "an order is paid for when the CC info is provided" do +# +# end +end +# +# # create edit show update completed cancelled paid diff --git a/test/controllers/product_categories_controller_test.rb b/test/controllers/product_categories_controller_test.rb new file mode 100644 index 0000000000..d3f2327e3b --- /dev/null +++ b/test/controllers/product_categories_controller_test.rb @@ -0,0 +1,54 @@ +require 'test_helper' + +class ProductCategoriesControllerTest < ActionController::TestCase + setup do + @product_category = product_categories(:one) + end + + test "should get new" do + params = products(:one) + get :new, { product_id: params.id } + assert_response :success + end + + test "should create product_category" do + product = products(:one) + category = categories(:one) + + assert_difference('ProductCategory.count', 1) do + post :create, { product_id: product.id, category_ids: [category.id] } + end + + assert_redirected_to products_path + end + + test "should not create product_category if no category selected" do + product = products(:one) + + assert_no_difference('ProductCategory.count') do + post :create, { product_id: product.id } + end + + assert_redirected_to products_path + end + + test "should add the correct number of product_category items for the number of categories added to the product" do + product = products(:three) + category1 = categories(:one) + category2 = categories(:two) + + category_ids = [category1.id, category2.id] + num_of_categories = category_ids.length + prev_num_of_prod_cat = ProductCategory.where(product_id: product.id).length + + + assert_difference('ProductCategory.count', 2) do + post :create, { product_id: product.id, category_ids: category_ids } + end + + current_num_of_prod_cat = ProductCategory.where(product_id: product.id).length + + + assert_equal current_num_of_prod_cat, (prev_num_of_prod_cat + num_of_categories) + end +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..d1e2ab509d --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,179 @@ +require 'test_helper' + +class ProductsControllerTest < ActionController::TestCase + test "index displays all the products if no merchant_id or category_id is given" do + get :index + assert_response :success + assert_template :index + + products_from_controller = assigns(:products) + assert_equal Product.count, products_from_controller.length + end + + test "index displays all the products for a merchant (when called in the context of a merchant)" do + # fake a merchant ID in the request + get :index, merchant_id: merchants(:one).id + assert_response :success + assert_template :index + + # Same merchant returned from the index method + assert_equal assigns(:merchant), merchants(:one) + + products_from_controller = assigns(:products) + + assert_equal products_from_controller.count, merchants(:one).products.count + # Each product returned belongs to that merchant. + products_from_controller.each do |product| + assert_includes merchants(:one).products, product + end + end + test "products#show displays a product if it exists!" do + product_id = products(:one).id + get :show, { id: product_id } + + assert_response :success + product = assigns(:product) + assert_not_nil product + assert_equal product.id, product_id + + #this controller doesn't make a new artist + assert_no_difference ('Product.count') do + get :show, { id: product_id } + end + end + + test "if a product belongs to a user, @user_page should be true so that we show the right things on the show page" do + #fake a user logged in + session[:user_id] = merchants(:one).id + + product_id = products(:one).id + + get :show, {id: product_id} + assert_equal assigns(:user_page), true + + end + + # test "products#show displays an error page if product does not exist" do + # skip + # # TODO + # end + + test "products#new displays the new form for logged in merchant" do + #fake a user is logged in. + session[:user_id] = merchants(:one).id + + get :new, {merchant_id: session[:user_id]} + + assert_response :success + assert_template :new + end + + test "products#new is only visible to logged in users" do + # Ensure there is no logged in user. + session.delete(:user_id) + + get :new, {merchant_id: merchants(:one).id} + assert_response :redirect + assert_redirected_to login_failure_path + end + + test "can create a valid product (if logged in)" do + #faking logged in + session[:user_id] = merchants(:one).id + + product_params = + { name: "Jammy Jams", + description: "They make the best jam.", + price: 349, + stock_quantity: 1, + photo_url: 'grapes.jpg', + } + + # make a new product actually adds a product to the database. + assert_difference('Product.count', 1) do + post :create, merchant_id: session[:user_id], product: product_params + end + + post :create, merchant_id: session[:user_id], product: product_params + + + # TODO: write a test that redirects to product_categories#new path where a customer should add their new product to some categories after they make the product. + end + + test "cannot create a new product if not logged in" do + # Ensure there is no logged in user. + session.delete(:user_id) + + post :create, {merchant_id: merchants(:one).id} + assert_response :redirect + assert_redirected_to login_failure_path + end + + test "can get the edit page for their own product" do + #faking logged in + session[:user_id] = merchants(:one).id + product_id = merchants(:one).products.first.id + + get :edit, {id: product_id} + #user is owner of product + assert_equal products(:one).merchant_id, session[:user_id] + + assert_response :success + end + + test "user cannot edit product if they're not the owner." do + #ensure a user not logged in + session.delete(:user_id) + product = merchants(:one).products.first + + get :edit, {id: product.id} + + #user cannot see edit page. + assert_redirected_to product_path(product.id) + + #fake a user logged in + session[:user_id] = merchants(:two).id + + #this product belongs to merchant one. + get :edit, {id: product.id} + + #user cannot see edit page. + assert_redirected_to product_path(product.id) + end + + test "user can successfully update a product they own" do + #fake a user logged in + session[:user_id] = merchants(:one).id + product = merchants(:one).products.first + + product.name = "Jammy Jams" + + patch :update, { id: product.id, product: product.attributes } + + assert_redirected_to merchant_path(session[:user_id]) + + #updating a product should not add a new product to the database. + + product.description = "The best product ever. Believe me." + + assert_difference('Product.count', 0) do + patch :update, { id: product.id, product: product.attributes } + end + # We should add a test for the redirect in here, but Sky updated the redirect. + end + + # I can't get this test to work. + # test "if I don't supply a required field get redirected to edit" do + # #fake a user logged in. + # session[:user_id] = merchants(:one).id + # product = merchants(:one).products.first + # + # product.name = products(:two).name + # + # #this should fail + # patch :update, { id: product.id, product: product.attributes, merchant: merchants(:one) } + # #this should render + # assert_template :edit + # + # end +end diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb new file mode 100644 index 0000000000..ec4290bb19 --- /dev/null +++ b/test/controllers/reviews_controller_test.rb @@ -0,0 +1,59 @@ +require 'test_helper' + +class ReviewsControllerTest < ActionController::TestCase + + test "Should render reviews index page for a specific product" do + product = products(:one) + + get :index, product_id: product.id + assert_response :success + end + + test "If there are no reviews for a product, will redirect you to the product show page" do + product = products(:one) + product.reviews = [] + + get :index, product_id: product.id + assert_redirected_to product_path(product.id) + end + + test "Should render reviews new page for a specific product" do + product = products(:two) + + get :new, product_id: product.id + assert_response :success + end + + test "Should return the correct number of reviews for a specific product" do + product = products(:one) + + assert_equal(product.reviews.count, 2) + end + + test "Can create a review with a product id and rating" do + test_product = products(:one) + + assert_difference('Review.count', 1) do + post :create, product_id: test_product.id, review: { rating: 5, title: "test" } + end + + assert_redirected_to product_reviews_path + end + + test "Cannot create a review with an product id and no rating" do + test_product = products(:one) + + assert_no_difference('Review.count') do + post :create, product_id: test_product.id, review: { title: "test" } + end + end + + test "Cannot create a review with an invalid product id and a valid rating" do + test_product = products(:one) + test_product.id = 90008 + + assert_no_difference('Review.count') do + post :create, product_id: test_product.id, review: { rating: 5, title: "test" } + end + end +end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..4412118c95 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,60 @@ +require 'test_helper' + +class SessionsControllerTest < ActionController::TestCase + def login_a_user + request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google] + get :create, {provider: "google"} + end + + test "should get index" do + session[:user_id] = merchants(:one).id + + get :index + assert_response :success + assert_equal assigns(:user).id, session[:user_id] + end + + test "Attempting to log in without email should send you to login failure page" do + # login_a_user + request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google] + user = request.env['omniauth.auth'][:info] + user.email = nil + + assert_no_difference('Merchant.count') do + get :create, {provider: "google"} + end + assert_template :login_failure + end + + test "Can Create a user" do + assert_difference('Merchant.count', 1) do + login_a_user + + assert_response :redirect + assert_redirected_to merchant_path(session[:user_id]) + assert_not_nil session[:user_id] + end + end + + test "If a user logs in twice it doesn't create a 2nd user" do + assert_difference('Merchant.count', 1) do + login_a_user + end + + assert_no_difference('Merchant.count') do + login_a_user + assert_response :redirect + assert_redirected_to merchant_path(session[:user_id]) + assert_not_nil session[:user_id] + end + end + + test "If a user logs out user_id should be nil and should be redirected to the right place" do + login_a_user + get :destroy + + assert_response :redirect + assert_redirected_to root_path + assert_nil session[:user_id] + end +end diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 0000000000..75457a873a --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,14 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + name: textiles + description: All the napkins in the world. + photo_url: https://instagram.fsnc1-1.fna.fbcdn.net/t51.2885-15/e35/12816929_202522856792499_1943289082_n.jpg +two: + name: cookies + description: Seriously, cookies. + photo_url: https://instagram.fsnc1-1.fna.fbcdn.net/t51.2885-15/e35/12547505_182223832136468_536848961_n.jpg diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml new file mode 100644 index 0000000000..8dcb52b11f --- /dev/null +++ b/test/fixtures/merchants.yml @@ -0,0 +1,29 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + name: Heart Shaped Everything + email: sales@hse.org + uid: 1234567890qwerty + provider: betsoogle + +two: + name: Picnic Ant + email: sales@picnicant.com + uid: qwerty1234567890 + provider: betsoogle + +three: + name: Gingham Suppliers + email: gingham@suppliers.ya + uid: qwerty123456789 + provider: betsoogle + +four: + name: Gingham Suppliers + email: gingham@suppliers.ya + uid: qwerty123456789 + provider: betsoogle diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 0000000000..519098eca6 --- /dev/null +++ b/test/fixtures/order_items.yml @@ -0,0 +1,37 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + order: one + product: one + quantity: 1 + shipping_status: false +# +two_true: + order: one + product: two + quantity: 2 + shipping_status: true + +three_true: + order: two + product: one + quantity: 1 + shipping_status: true + +# To show that you can not add more quantity than in the stock +four: + order: three_pending + product: three + quantity: 1 + shipping_status: false + +# To show that you can not update the quantity if the order status is anything but pending. Can't use ones above because quantity would not be enough to add anything to the cart. +five: + order: two #paid + product: three + quantity: 1 + shipping_status: false diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..261a928119 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,41 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + name: A. Customer + email: person@email.com + mailing_address: 1234 NW 56th Street, Seattle, WA 98107 + cc_last_4: 1234 + cc_expire: <%= Date.new(2017, 12, 31) %> + purchase_time: <%= DateTime.now %> + status: paid + +two: + name: B. Customer + email: person_two@email.com + mailing_address: 98765 NW 56th Street, Seattle, WA 98107 + cc_last_4: 1234 + cc_expire: <%= Date.new(2017, 12, 31) %> + purchase_time: <%= DateTime.now %> + status: paid + +three_pending: + name: C. Customer + email: person_three@email.com + mailing_address: 98765 NW 56th Street, Seattle, WA 98107 + cc_last_4: 1234 + cc_expire: <%= Date.new(2017, 12, 31) %> + purchase_time: <%= DateTime.now %> + status: pending + +four_shipped: + name: D. Customer + email: person_four@email.com + mailing_address: 4567 NW 56th Street, Seattle, WA 98107 + cc_last_4: 4567 + cc_expire: <%= Date.new(2017, 12, 31) %> + purchase_time: <%= DateTime.now %> + status: completed diff --git a/test/fixtures/product_categories.yml b/test/fixtures/product_categories.yml new file mode 100644 index 0000000000..c77291f6fa --- /dev/null +++ b/test/fixtures/product_categories.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + product: one + category: one +two: + product: two + category: two +three: + product: one + category: two diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..54c4c3f4cf --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,29 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + name: Hot Toddy + price: 1200 + stock_quantity: 1 + description: Who doesn't like a nice hot toddy on a cold day? + photo_url: http://assets.epicurious.com/photos/5761c7f08accf290434553a2/master/pass/hot-toddy.jpg + merchant: one + # apparently, I can associate them by name with the active record model name. +two: + name: Chocolate Covered Strawberries + price: 849 + stock_quantity: 2 + description: Best picnic snack ever! Get them today! + photo_url: https://c3.staticflickr.com/5/4100/4873551178_cb27bf93f6_b.jpg + merchant: two + +three: + name: Chocolate Bar + price: 400 + stock_quantity: 6 + description: How could you say no? + photo_url: https://c3.staticflickr.com/5/4100/4873551178_cb27bf93f6_b.jpg + merchant: two diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml new file mode 100644 index 0000000000..49521a609b --- /dev/null +++ b/test/fixtures/reviews.yml @@ -0,0 +1,21 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: + rating: 1 + title: Not for picnics. + body: Because apparently in parks you're not supposed to be openly drinking alcohol. Who knew. + product: one +two: + rating: 2 + title: I've seen worse. + body: Strawberries get kind of soggy when you coat them in chocolate and then put them in a picnic basket. Better to eat them right out of the fridge. + product: two +three: + rating: 4 + title: Nom Nom Nom + body: Thinky Drinky every day! + product: one diff --git a/test/models/category_test.rb b/test/models/category_test.rb new file mode 100644 index 0000000000..c71359be5c --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,45 @@ +require 'test_helper' + +class CategoryTest < ActiveSupport::TestCase + def login_a_user + request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google] + get :create, {provider: "google"} + end + + test "A merchant can create a category with a name and image" do + + end + + test "A merchant cannot create a category without a name" do + + end + + test "A merchant cannot create a category without an image" do + + end + + test "A user cannot create a category with a name and image" do + + end + + test "redirects you to the category_not_found page if category doesn't exist" do + + end + + # test "A user and merchant is able to get the correct number of categories on the index page" do + # assert_equal(Category.length, 2) + # end + + # test "A user and merchant is able to get index page" do + # get :index + # assert_response :success + # end + # + # test "A merchant and user is able to get show page" do + # category = categories(:two) + # + # get :show, category_id: category.id + # assert_response :success + # end + +end diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb new file mode 100644 index 0000000000..47f6570180 --- /dev/null +++ b/test/models/merchant_test.rb @@ -0,0 +1,69 @@ +require 'test_helper' + +class MerchantTest < ActiveSupport::TestCase + + test "Created merchant must take name, email, uid, and provider" do + merchant = Merchant.create!(name: "Aunt Betsy's", email: "auntie@betsy.to", uid: "qwert133557", provider: "betsoogle") + assert merchant.valid? + end + + test "Merchant is not valid when empty" do + invalid_merchant = Merchant.new + assert_not invalid_merchant.valid? + end + + test "Merchant must have a name" do + merchant = merchants(:one) + merchant.name = nil + assert_not merchant.valid? + end + + test "Merchant must have an email" do + merchant = merchants(:two) + merchant.email = nil + assert_not merchant.valid? + end + + test "Merchant must have a uid" do + merchant = merchants(:three) + merchant.uid = nil + assert_not merchant.valid? + end + + test "Merchant must have a provider" do + merchant = merchants(:four) + merchant.provider = nil + assert_not merchant.valid? + end + + test "Merchants must be created with unique name and email, duplicates are not allowed" do + valid_merchant = merchants(:three) # Might not need this, as :three should already be in database + duplicate_merchant = Merchant.new(name: "Gingham Suppliers", email: "gingham@suppliers.ya", uid: "qwerty123456789", provider: "betsoogle") + assert_not duplicate_merchant.save + end + + test "Merchant cannot be saved if name is same as a different merchant" do + # valid_merchant = merchants(:three) + merchant = merchants(:three) + merchant.name = "Ant's Blankets" + assert_not merchant.save + end + + test "Merchant cannot be saved if email is same as a different merchant" do + # valid_merchant = merchants(:four) + merchant = merchants(:four) + merchant.email = "do@re.mi" + assert_not merchant.save + end + + test "Many merchants can be saved on the database, and be individually retrieved" do + merchant = Merchant.new(name: "Aunt Betsy's", email: "auntie@betsy.to", uid: "qwert133557", provider: "betsoogle") + merchant2 = Merchant.new(name: "Strawberries and Champagne", email: "little.shop@strawberries.fr", uid: "asdf12345", provider: "betsoogle") + + assert merchant.save + assert merchant2.save + assert_includes Merchant.all, merchant + assert_includes Merchant.all, merchant2 + end + +end diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb new file mode 100644 index 0000000000..f5f11461cc --- /dev/null +++ b/test/models/order_item_test.rb @@ -0,0 +1,77 @@ +require 'test_helper' + +class OrderItemTest < ActiveSupport::TestCase + test "create a new order item with valid data" do + assert order_items(:one).valid? + assert order_items(:two_true).valid? + end + + test "Should reject an OrderItem with no quantity" do + item = OrderItem.new(product_id: products(:one).id, order_id: orders(:two).id) + assert_not item.valid? + end + + test "Should reject an OrderItem with a quantity other than an integer" do + order_item = OrderItem.new(product_id: products(:two).id, order_id: orders(:two).id, quantity: "a") + order_item2 = OrderItem.new(product_id: products(:one).id, order_id: orders(:two).id, quantity: false) + assert_not order_item.valid? + assert_not order_item2.valid? + end + + test "Must belong to a product AND order" do + item = OrderItem.new(product_id: products(:one).id, order_id: orders(:two).id, quantity: 1) + assert item.valid? + item_two = OrderItem.new(product_id: 1, order_id: orders(:two), quantity: 1) + item_three = OrderItem.new(product_id: products(:one).id, order_id: 1, quantity: 1) + assert_not item_two.valid? + assert_not item_three.valid? + end + + test "Should reject an OrderItem with a quantity less than or equal to 0" do + order_item = OrderItem.new(product_id: products(:two), order_id: orders(:two), quantity: -1) + order_item2 = OrderItem.new(product_id: products(:one), order_id: orders(:two), quantity: 0) + assert_not order_item.valid? + assert_not order_item2.valid? + end + + test "the method create_order_item should create a new OrderItem instance" do + product = products(:one) + order = orders(:one) + assert_difference('OrderItem.count', 1) do + OrderItem.create_order_item(product, order) + end + end + + #_____________________________________________________# + # @todo write the code to pass these tests + #_____________________________________________________# + # these tests need access to order items that are pending and access to orders and products that are not connected!!!! + + test "the method create_order_item should not create a new order item if there is already one with current order and product" do + # These fixtures are connected in the fixtures + product = products(:one) + order = orders(:one) + + assert_difference('OrderItem.count', 1) do + OrderItem.create_order_item(product, order) + end + end + + test "the method update_order_item should update the quantity of an order item by one when the product is added to the order a second time" do + # These fixtures are connected in the fixtures + product = products(:one) + order = orders(:one) + order_item = order_items(:one) + + assert_equal(product.id, order_item.product_id) + assert_equal(order.id, order_item.order_id) + + order_item[:quantity] = 20 + order_item.save + model_oi = OrderItem.update_order_item(product, order) + + assert_equal(model_oi, order_item) + assert_equal(model_oi.quantity, 21) + end + +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..07344b7ad6 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,47 @@ +require 'test_helper' + +class OrderTest < ActiveSupport::TestCase + test "create a new order with valid input values" do + assert products(:one).valid? + end + + test "cannot create a order without a status" do + order = Order.new(name: "Penny") + assert_not order.valid? + end + + test "cannot create a order without an incorrect status" do + order = Order.new(status: "Penny") + assert_not order.valid? + end + + test "cannot change an order's status to an incorrect value" do + order = orders(:one) + order.status = "Penny" + assert_not order.valid? + end + + test "order should return correct number of products" do + order = orders(:one) + assert_respond_to(order, :products) + + assert_equal(order.products.length, 2) + end + + # test "The open? method will return true if an order is 'pending' and 'false' if it is 'paid', 'cancelled', or 'complete'" do + # end + + + # REMOVED BECAUSE NO LONGER VALIDATING ORDER_ITEM + # test "order cannot be created without an order item" do + # test_order = orders(:one) + # assert_respond_to(test_order, :order_items) + # test_order.order_items.each do | order | + # OrderItem.destroy(order.id) + # end + # + # test_order.reload + # assert_not test_order.valid? + # end + +end diff --git a/test/models/product_category_test.rb b/test/models/product_category_test.rb new file mode 100644 index 0000000000..6f788ebac5 --- /dev/null +++ b/test/models/product_category_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductCategoryTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..48a08123f9 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,90 @@ +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + test "create a new product with valid data" do + assert products(:one).valid? + assert products(:two).valid? + end + + test "new product without name is not valid" do + no_name = products(:one) + no_name.name = nil + + assert_not no_name.valid? + end + + test "new product with same name as another product is not valid" do + not_new = products(:one) + not_new.name = products(:two).name + + assert_not not_new.valid? + end + + test "new product without price is not valid" do + no_price = products(:one) + no_price.price = nil + + assert_not no_price.valid? + end + + test "price cannot be negative" do + we_pay_you = products(:one) + we_pay_you.price = -1234 + + assert_not we_pay_you.valid? + end + + test "price has to be an integer" do + how_much = products(:one) + how_much.price = "$12" + + assert_not how_much.valid? + + how_much.price = 12.34 + + assert_not how_much.valid? + end + + test "price of 0 is not valid" do + free = products(:one) + free.price = 0 + + assert_not free.valid? + end + + test "product with no merchant is not valid" do + whose = products(:one) + whose.merchant_id = nil + + assert_not whose.valid? + end + + test "product should have categories" do + prod = products(:one) + assert_respond_to(prod, :categories) + end + + # This test is commented out because we've removed the validation for at least one category. + # test "product should have at least one category" do + # #This product doesn't have any categories through product_categories, because I've just created it here. It's not valid because validations says we should have at least one product_category. + # prod = Product.new(name:"a valid name", merchant_id: merchants(:one), price: 1200, stock_quantity: 1) + # + # assert_not prod.valid? + # end + + test "product cannot have invalid stock_quantity" do + product = products(:one) + product.stock_quantity = -1 + + assert_not product.valid? + + product.stock_quantity = "none" + + assert_not product.valid? + + product.stock_quantity = nil + + assert_not product.valid? + end + +end diff --git a/test/models/review_test.rb b/test/models/review_test.rb new file mode 100644 index 0000000000..f4615d3e24 --- /dev/null +++ b/test/models/review_test.rb @@ -0,0 +1,45 @@ +require 'test_helper' + +class ReviewTest < ActiveSupport::TestCase + # Rating must be present + # Rating must be between 1 and 5 + test "Creates a review with a rating that is an integer and a product_id" do + review = Review.new(rating: 4, product: products(:one)) + assert review.valid? + end + + test "Cannot create a review without a rating" do + review = Review.new(title: "Awesome Product", product: products(:one)) + assert_not review.valid? + end + + # Rating must be an integer + test "Cannot create a review with a rating that is not and integer" do + review = Review.new(rating: "five stars", product: products(:one)) + assert_not review.valid? + end + + # Rating must be between 1 and 5 + test "Cannot create a review with a rating that is > 5" do + review = Review.new(rating: 6, product: products(:one)) + assert_not review.valid? + end + + test "Cannot create a review with a rating that is < 1" do + review = Review.new(rating: 0, product: products(:one)) + assert_not review.valid? + end + + # belongs_to: Product + test "Cannot create review without a product_id" do + review = Review.new(rating: 5) + assert_not review.valid? + end + + test "Review belongs to a specific product" do + review = reviews(:one) + assert_equal(review.product_id, products(:one).id) + end + + +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 92e39b2d78..8572524ec4 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,10 +1,25 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +require 'minitest/reporters' +require 'simplecov' +SimpleCov.start + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all # Add more helper methods to be used by all tests here... + Minitest::Reporters.use! + + def setup + # Turn on test mode - auth requests will be short-circuited + # OmniAuth.config.test_mode = true + # What data should we get back from auth requests? + + OmniAuth.config.mock_auth[:google] = OmniAuth::AuthHash.new({ + provider: 'google', uid: '88888', info: { email: "a@b.com", name: "Ada" } + }) + end end
+ + Checkout + +<%= @order.name%>, please complete the following information to complete your checkout. + +<%= form_for(@order, url: pay_for_order_path) do |f| %> + +<%= f.label :name %> +<%= f.text_field :name %> + +<%= f.label :email %> +<%= f.text_field :email %> + +<%= f.label :mailing_address %> +<%= f.text_field :mailing_address %> + +<%= f.label :cc_last_4%> +<%= f.text_field :cc_last_4 %> + +<%= f.label :cc_expire %> +<%= f.text_field :cc_expire %> + +<%= f.hidden_field :status, :value => "paid" %> + + <%= f.submit "Complete Order" %> +<% end %> +
+ + Order Page for <%= @order.name%> + + + <%if flash[:notice]%> + <%= flash[:notice] %> + <%end%> + + +<% if @order.status == "pending" %> + + + <%= button_to "Checkout", checkout_path(@order.id), method: :get %> + +<% end %> + +<%= render partial: "order_info" %> + + + + + Order Information: + + Product Item + Quantity + Price per Item + Total + Associated Merchant + Shipped? + + <% @order_items.each do |item| %> + + + <%= Product.find(item.product_id).name%> + <%= item.quantity%> + <%= money_format(Product.find(item.product_id).price)%> + <%= money_format(Product.find(item.product_id).price * item.quantity)%> + <%= Product.find(item.product_id).merchant_id%> + + <%= item.shipping_status%> + <% if @current_user == Product.find(item.product_id).merchant_id %> + <%= button_to "ship this product", some_path %> + <% end %> + + + <% end %> + + + Grand Total:<%= money_format(@total_revenue) %> + + +<% @order_items.each do |item| %> + <% if @order.id == item.order_id %> + Merchant_id: <%=(item.product.merchant_id) %>Product_id: <%= item.product_id %> Order_id <%= item.order_id %> + <% end %> +<% end %> + + +
+ + Select all of the Categories that your Product belongs to: + + + + <%= render partial: "form", locals: { submit_url: product_product_categories_path, http_method: :post } %> + +
+ + Hi, <%= @current_user.name %>! You're editing <%= @product.name %> ! + + <%= render partial: "form", locals: { http_method: :patch } %> +
+ + + All the Products + <% if @merchant %> + for <%= @merchant.name %> + <% end %> + + + + + + <% @products.each do |product| %> + + <%= link_to(image_tag(product.photo_url, class:"product-img-thumbnail"), product_path(product)) %> + <%= link_to "#{product.name}", product_path(product), class: "product-link increase-font2" %> + + <% end %> + + +
+ + Hi, <%= @current_user.name %>! You're making a new product! + + + + + Please add a category if you do not see an appropriate one for your product below: + <%= link_to "Add a Category", new_category_path, class: "button small-2 columns" %> + + + + + <% @all_categories.each do | category | %> + <%= category.name %> + <% end %> + + + + + + + + <%= render partial: "form", locals: { http_method: :post } %> + +
+ + + <% if flash[:notice] %> + <%= flash[:notice] %> + <% end %> + + + + <%= @product.name %> + + + + + + <%= image_tag(@product.photo_url, class: "product-imgpadding-bot") %> + + + + Price + <%= money_format(@product.price) %> + + + <% if @product.stock_quantity > 0 %> + In Stock: + <%= @product.stock_quantity %> Available + <% else %> + OUT OF STOCK + <% end %> + + + Sold by: + <%= @product.merchant.name %> + + + Description: + <%= @product.description %> + + + Categories: + + <% @categories.each do |category| %> + <%= link_to category.name, category_path(category.id)%> + <% end %> + + + + + + <% if @user_page %> + + <%= link_to "Edit", edit_product_path(params[:id]), class:"product-button" %> + + <% else %> + <%= link_to "Reviews", product_reviews_path(params[:id]), class:"product-button" %> + <%= link_to "Add a Review", new_product_review_path(params[:id]), class:"product-button" %> + + <%= link_to "Add to Cart", product_orders_path(params[:id]), method: :post, class:"product-button" %> + <% end %> + + + +
+ <% if @user_page %> + + <%= link_to "Edit", edit_product_path(params[:id]), class:"product-button" %> + + <% else %> + <%= link_to "Reviews", product_reviews_path(params[:id]), class:"product-button" %> + <%= link_to "Add a Review", new_product_review_path(params[:id]), class:"product-button" %> + + <%= link_to "Add to Cart", product_orders_path(params[:id]), method: :post, class:"product-button" %> + <% end %> +
+ + <%= "Reviews for #{@product.name}" %> + + + + + + <% @reviews_by_product.each do | review | %> + + <%= "#{review.title} (Rating: #{review.rating}):" %> + <%= "#{review.body}" %> + + + <% end %> + + + + <%= link_to "Add a Review", new_product_review_path(params[:product_id]), class: "product-button" %> + +
+ + Add a Review + + + <% if @review.errors.any? %> + + <% @review.errors.each do |column, message| %> + + <%= column.capitalize %> <%= message %> + + <% end %> + + <% end %> + + <%= form_for @review, class: "", html: {class: 'form'}, url: product_reviews_path, http_method: :post do |f| %> + + + <%= f.label :title, 'Title:' %> + <%= f.text_field :title %> + + <%= f.label :rating, 'Rating:(1-5)' %> + <%= f.text_field :rating %> + + <%= f.label :body %> + <%= f.text_field :body %> + + <%= f.submit :class => 'button' %> + + <% end %> +
+ + <%= f.label :title, 'Title:' %> + <%= f.text_field :title %> + + <%= f.label :rating, 'Rating:(1-5)' %> + <%= f.text_field :rating %> + + <%= f.label :body %> + <%= f.text_field :body %> + + <%= f.submit :class => 'button' %> +
+ + Sorry, something went wrong with your login. Please click below to try again. + + + <%= link_to "Log In", "/auth/google" %> +