+ Quantity: <%= item.quantity %> |
+ <% if @order.status == "incomplete"%>
+ <%= link_to("Adjust", edit_order_item_path(item.id)) %> |
+ <%= link_to("Remove", order_item_path(item.id), method: :delete, data: {confirm: "Are you sure you would like to remove this item from your cart?"}) %>
+ <% end %>
+ <% end %>
+
+<%= @order.order_items.count > 0 ? link_to("Proceed to Payment", edit_order_path(@order.id), class: "button") : link_to("Shop All Items", products_path) %>
+
+<% end %>
diff --git a/app/views/orders/user_order.html.erb b/app/views/orders/user_order.html.erb
new file mode 100644
index 0000000000..5c76ffdda8
--- /dev/null
+++ b/app/views/orders/user_order.html.erb
@@ -0,0 +1,14 @@
+
+
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000000..66e9889e8b
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000000..5badb2fde0
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+ load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+ raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000000..d87d5f5781
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+ load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+ raise unless e.message.include?('spring')
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 0000000000..78c4e861dc
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+ system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+ # This script is a starting point to setup your application.
+ # Add necessary setup steps to this file.
+
+ puts '== Installing dependencies =='
+ system! 'gem install bundler --conservative'
+ system('bundle check') || system!('bundle install')
+
+ # Install JavaScript dependencies if using Yarn
+ # system('bin/yarn')
+
+
+ # puts "\n== Copying sample files =="
+ # unless File.exist?('config/database.yml')
+ # cp 'config/database.yml.sample', 'config/database.yml'
+ # end
+
+ puts "\n== Preparing database =="
+ system! 'bin/rails db:setup'
+
+ puts "\n== Removing old logs and tempfiles =="
+ system! 'bin/rails log:clear tmp:clear'
+
+ puts "\n== Restarting application server =="
+ system! 'bin/rails restart'
+end
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 0000000000..fb2ec2ebb4
--- /dev/null
+++ b/bin/spring
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+ require 'rubygems'
+ require 'bundler'
+
+ lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+ spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+ if 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/bin/update b/bin/update
new file mode 100755
index 0000000000..a8e4462f20
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+ system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+ # This script is a way to update your development environment automatically.
+ # Add necessary update steps to this file.
+
+ puts '== Installing dependencies =='
+ system! 'gem install bundler --conservative'
+ system('bundle check') || system!('bundle install')
+
+ puts "\n== Updating database =="
+ system! 'bin/rails db:migrate'
+
+ puts "\n== Removing old logs and tempfiles =="
+ system! 'bin/rails log:clear tmp:clear'
+
+ puts "\n== Restarting application server =="
+ system! 'bin/rails restart'
+end
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 0000000000..c2bacef836
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+ begin
+ exec "yarnpkg #{ARGV.join(" ")}"
+ rescue Errno::ENOENT
+ $stderr.puts "Yarn executable was not detected in the system."
+ $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+ exit 1
+ end
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000000..f7ba0b527b
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application
diff --git a/config/application.rb b/config/application.rb
new file mode 100644
index 0000000000..a47233460d
--- /dev/null
+++ b/config/application.rb
@@ -0,0 +1,25 @@
+require_relative 'boot'
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Betsy
+ class Application < Rails::Application
+ config.generators do |g|
+ # Force new test files to be generated in the minitest-spec style
+ g.test_framework :minitest, spec: true
+
+ # Always use .js files, never .coffee
+ g.javascript_engine :js
+ end
+ # Initialize configuration defaults for originally generated Rails version.
+ config.load_defaults 5.1
+
+ # Settings in config/environments/* take precedence over those specified here.
+ # Application configuration should go into files in config/initializers
+ # -- all .rb files in that directory are automatically loaded.
+ end
+end
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 0000000000..30f5120df6
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 0000000000..3cba994bb2
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+ adapter: async
+
+test:
+ adapter: async
+
+production:
+ adapter: redis
+ url: redis://localhost:6379/1
+ channel_prefix: betsy_production
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 0000000000..6903bb6083
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,85 @@
+# PostgreSQL. Versions 9.1 and up are supported.
+#
+# 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'
+#
+default: &default
+ adapter: postgresql
+ encoding: unicode
+ # For details on connection pooling, see Rails configuration guide
+ # http://guides.rubyonrails.org/configuring.html#database-pooling
+ pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+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
+
+# 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
+
+# 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'] %>
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 0000000000..426333bb46
--- /dev/null
+++ b/config/environment.rb
@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
new file mode 100644
index 0000000000..5187e22186
--- /dev/null
+++ b/config/environments/development.rb
@@ -0,0 +1,54 @@
+Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb.
+
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the web server when you make code changes.
+ config.cache_classes = false
+
+ # Do not eager load code on boot.
+ config.eager_load = false
+
+ # Show full error reports.
+ config.consider_all_requests_local = true
+
+ # Enable/disable caching. By default caching is disabled.
+ if Rails.root.join('tmp/caching-dev.txt').exist?
+ config.action_controller.perform_caching = true
+
+ config.cache_store = :memory_store
+ config.public_file_server.headers = {
+ 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+ }
+ else
+ config.action_controller.perform_caching = false
+
+ config.cache_store = :null_store
+ end
+
+ # Don't care if the mailer can't send.
+ config.action_mailer.raise_delivery_errors = false
+
+ config.action_mailer.perform_caching = false
+
+ # Print deprecation notices to the Rails logger.
+ config.active_support.deprecation = :log
+
+ # Raise an error on page load if there are pending migrations.
+ config.active_record.migration_error = :page_load
+
+ # Debug mode disables concatenation and preprocessing of assets.
+ # This option may cause significant delays in view rendering with a large
+ # number of complex assets.
+ config.assets.debug = true
+
+ # Suppress logger output for asset requests.
+ config.assets.quiet = true
+
+ # Raises error for missing translations
+ # config.action_view.raise_on_missing_translations = true
+
+ # Use an evented file watcher to asynchronously detect changes in source code,
+ # routes, locales, etc. This feature depends on the listen gem.
+ config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
new file mode 100644
index 0000000000..fc10d8bc4d
--- /dev/null
+++ b/config/environments/production.rb
@@ -0,0 +1,102 @@
+Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb.
+
+ # Code is not reloaded between requests.
+ config.cache_classes = true
+
+ # Eager load code on boot. This eager loads most of Rails and
+ # your application in memory, allowing both threaded web servers
+ # and those relying on copy on write to perform better.
+ # Rake tasks automatically ignore this option for performance.
+ config.eager_load = true
+
+ # Full error reports are disabled and caching is turned on.
+ config.consider_all_requests_local = false
+ config.action_controller.perform_caching = true
+
+ # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+ # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+ # `config/secrets.yml.key`.
+ config.read_encrypted_secrets = true
+
+ # Disable serving static files from the `/public` folder by default since
+ # Apache or NGINX already handles this.
+ config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+ # Compress JavaScripts and CSS.
+ config.assets.js_compressor = :uglifier
+ # config.assets.css_compressor = :sass
+
+ # Do not fallback to assets pipeline if a precompiled asset is missed.
+ config.assets.compile = false
+
+ # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+ # config.action_controller.asset_host = 'http://assets.example.com'
+
+ # Specifies the header that your server uses for sending files.
+ # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+ # Mount Action Cable outside main process or domain
+ # config.action_cable.mount_path = nil
+ # config.action_cable.url = 'wss://example.com/cable'
+ # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+ # config.force_ssl = true
+
+ # Use the lowest log level to ensure availability of diagnostic information
+ # when problems arise.
+ config.log_level = :debug
+
+ # Prepend all log lines with the following tags.
+ config.log_tags = [ :request_id ]
+
+ # Use a different cache store in production.
+ # config.cache_store = :mem_cache_store
+
+ # Use a real queuing backend for Active Job (and separate queues per environment)
+ # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_name_prefix = "betsy_#{Rails.env}"
+ config.action_mailer.perform_caching = false
+
+ # Ignore bad email addresses and do not raise email delivery errors.
+ # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+ # config.action_mailer.raise_delivery_errors = false
+
+ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+ # the I18n.default_locale when a translation cannot be found).
+ config.i18n.fallbacks = true
+
+ # Send deprecation notices to registered listeners.
+ config.active_support.deprecation = :notify
+
+ # Use default logging formatter so that PID and timestamp are not suppressed.
+ config.log_formatter = ::Logger::Formatter.new
+
+ # Use a different logger for distributed setups.
+ # require 'syslog/logger'
+ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+ if ENV["RAILS_LOG_TO_STDOUT"].present?
+ logger = ActiveSupport::Logger.new(STDOUT)
+ logger.formatter = config.log_formatter
+ config.logger = ActiveSupport::TaggedLogging.new(logger)
+ end
+
+ # Do not dump schema after migrations.
+ config.active_record.dump_schema_after_migration = false
+
+ config.paperclip_defaults = {
+ storage: :s3,
+ s3_credentials: {
+ bucket: ENV.fetch('S3_BUCKET_NAME'),
+ access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+ secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+ s3_region: ENV.fetch('AWS_REGION'),
+ s3_host_name: "s3-#{ENV['AWS_REGION']}.amazonaws.com",
+ }
+ }
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
new file mode 100644
index 0000000000..8e5cbde533
--- /dev/null
+++ b/config/environments/test.rb
@@ -0,0 +1,42 @@
+Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb.
+
+ # The test environment is used exclusively to run your application's
+ # test suite. You never need to work with it otherwise. Remember that
+ # your test database is "scratch space" for the test suite and is wiped
+ # and recreated between test runs. Don't rely on the data there!
+ config.cache_classes = true
+
+ # Do not eager load code on boot. This avoids loading your whole application
+ # just for the purpose of running a single test. If you are using a tool that
+ # preloads Rails for running tests, you may have to set it to true.
+ config.eager_load = false
+
+ # Configure public file server for tests with Cache-Control for performance.
+ config.public_file_server.enabled = true
+ config.public_file_server.headers = {
+ 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+ }
+
+ # Show full error reports and disable caching.
+ config.consider_all_requests_local = true
+ config.action_controller.perform_caching = false
+
+ # Raise exceptions instead of rendering exception templates.
+ config.action_dispatch.show_exceptions = false
+
+ # Disable request forgery protection in test environment.
+ config.action_controller.allow_forgery_protection = false
+ config.action_mailer.perform_caching = false
+
+ # Tell Action Mailer not to deliver emails to the real world.
+ # The :test delivery method accumulates sent emails in the
+ # ActionMailer::Base.deliveries array.
+ config.action_mailer.delivery_method = :test
+
+ # Print deprecation notices to the stderr.
+ config.active_support.deprecation = :stderr
+
+ # Raises error for missing translations
+ # config.action_view.raise_on_missing_translations = true
+end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 0000000000..89d2efab2b
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+# ApplicationController.renderer.defaults.merge!(
+# http_host: 'example.org',
+# https: false
+# )
+# end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 0000000000..4b828e80cb
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
new file mode 100644
index 0000000000..59385cdf37
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000000..5a6a32d371
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
+Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 0000000000..4a994e1e7b
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
new file mode 100644
index 0000000000..ac033bf9dc
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+# inflect.plural /^(ox)$/i, '\1en'
+# inflect.singular /^(ox)en/i, '\1'
+# inflect.irregular 'person', 'people'
+# inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+# inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
new file mode 100644
index 0000000000..dc1899682b
--- /dev/null
+++ b/config/initializers/mime_types.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 0000000000..fd4416122a
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,3 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email"
+end
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
new file mode 100644
index 0000000000..bbfc3961bf
--- /dev/null
+++ b/config/initializers/wrap_parameters.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+ wrap_parameters format: [:json]
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+# self.include_root_in_json = true
+# end
diff --git a/config/locales/en.yml b/config/locales/en.yml
new file mode 100644
index 0000000000..decc5a8573
--- /dev/null
+++ b/config/locales/en.yml
@@ -0,0 +1,33 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+# I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+# <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+# I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+# 'true': 'foo'
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+ hello: "Hello world"
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 0000000000..1e19380dcb
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,56 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# If you are preloading your application and using Active Record, it's
+# recommended that you close any connections to the database before workers
+# are forked to prevent connection leakage.
+#
+# before_fork do
+# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
+# end
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+# ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end
+#
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
new file mode 100644
index 0000000000..fde5f11779
--- /dev/null
+++ b/config/routes.rb
@@ -0,0 +1,49 @@
+Rails.application.routes.draw do
+
+ root 'static_pages#home'
+
+ get "/products/category/", to: "products#by_category", as: 'products_by_category'
+
+ get "/products/merchant/", to: "products#by_merchant", as: 'products_by_merchant'
+
+ get "/users/:id/orders", to: "users#order_fulfillment", as: 'order_fulfillment' #order_fulfillment_path
+
+ get "/users/:user_id/orders/:id", to: "orders#user_order",as: "user_order"
+
+ resources :products do
+ resources :reviews, only: [:new, :create]
+ resources :order_items, only: [:new, :create]
+ end
+
+ resources :carts, except: [:destroy, :index, :new]
+
+ resources :order_items, except: [:new, :create]
+
+ resources :users do
+ resources :orders, only: [:index]
+ resources :order_items, only: [:index, :show, :edit, :update]
+ end
+
+ resources :users, only: [:index, :show, :edit, :update]
+
+ resources :reviews, except: [:new, :create]
+
+ resources :orders
+ patch '/orders', to: 'orders#place_order', as: 'place_order'
+
+ get '/login', to: 'sessions#login_form', as: 'login'
+ post '/login', to: 'sessions#login'
+ post '/logout', to: 'sessions#logout', as: 'logout'
+
+ get "/auth/:provider/callback", to: "sessions#create", as: "auth_callback"
+
+ get '/users/:id/products', to: 'users#account', as: 'user_account'
+
+ resources :categories, only: [:create, :new, :index] do
+ get '/products', to: 'product#index'
+ end
+
+ patch '/order_item/:id/mark_shipped', to: 'order_items#mark_shipped', as: 'item_shipped'
+
+ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+end
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 0000000000..4215c21055
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,32 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rails secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+# Shared secrets are available across all environments.
+
+# shared:
+# api_key: a1B2c3D4e5F6
+
+# Environmental secrets are only available for that specific environment.
+
+development:
+ secret_key_base: e582c5a9c9425906d57670eb87588e61de7c2ed8d89128a3a884d42569b3706e63be023df9fdee9c2a43af871860edc705f8fe0f2d9ee659b4a36618689944f8
+
+test:
+ secret_key_base: d41428ecfc558490ca4878123f3f0c2ef4b2e36e2bc9d9e603480f00d8371a039ff5caa8d86a12cf3b71c7a2c2a2474373db2d2a1bc2820919e22e7834e62272
+
+# Do not keep production secrets in the unencrypted secrets file.
+# Instead, either read values from the environment.
+# Or, use `bin/rails secrets:setup` to configure encrypted secrets
+# and move the `production:` environment over there.
+
+production:
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 0000000000..c9119b40c0
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w(
+ .ruby-version
+ .rbenv-vars
+ tmp/restart.txt
+ tmp/caching-dev.txt
+).each { |path| Spring.watch(path) }
diff --git a/db/.DS_Store b/db/.DS_Store
new file mode 100644
index 0000000000..4d909151fb
Binary files /dev/null and b/db/.DS_Store differ
diff --git a/db/migrate/20171017193934_create_products.rb b/db/migrate/20171017193934_create_products.rb
new file mode 100644
index 0000000000..74426a5c00
--- /dev/null
+++ b/db/migrate/20171017193934_create_products.rb
@@ -0,0 +1,13 @@
+class CreateProducts < ActiveRecord::Migration[5.1]
+ def change
+ create_table :products do |t|
+ t.string :name
+ t.string :category
+ t.text :description
+ t.decimal :price
+ t.integer :quantity
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171017195248_create_users.rb b/db/migrate/20171017195248_create_users.rb
new file mode 100644
index 0000000000..b4c05914ad
--- /dev/null
+++ b/db/migrate/20171017195248_create_users.rb
@@ -0,0 +1,15 @@
+class CreateUsers < ActiveRecord::Migration[5.1]
+ def change
+ create_table :users do |t|
+ t.string :name
+ t.string :email
+ t.string :mailing_address
+ t.string :cc_number
+ t.date :cc_expiration_date
+ t.integer :cc_cvv
+ t.string :zipcode
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171017195841_create_reviews.rb b/db/migrate/20171017195841_create_reviews.rb
new file mode 100644
index 0000000000..824d97cf47
--- /dev/null
+++ b/db/migrate/20171017195841_create_reviews.rb
@@ -0,0 +1,10 @@
+class CreateReviews < ActiveRecord::Migration[5.1]
+ def change
+ create_table :reviews do |t|
+ t.integer :rating
+ t.text :text_review
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171017201702_create_orders.rb b/db/migrate/20171017201702_create_orders.rb
new file mode 100644
index 0000000000..8d3698575f
--- /dev/null
+++ b/db/migrate/20171017201702_create_orders.rb
@@ -0,0 +1,9 @@
+class CreateOrders < ActiveRecord::Migration[5.1]
+ def change
+ create_table :orders do |t|
+ t.string :status
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171017205926_add_user_i_dto_reviews.rb b/db/migrate/20171017205926_add_user_i_dto_reviews.rb
new file mode 100644
index 0000000000..512ad9ca74
--- /dev/null
+++ b/db/migrate/20171017205926_add_user_i_dto_reviews.rb
@@ -0,0 +1,5 @@
+class AddUserIDtoReviews < ActiveRecord::Migration[5.1]
+ def change
+ add_reference :reviews, :user, foreign_keys: true
+ end
+end
diff --git a/db/migrate/20171017210230_add_product_i_dto_reviews.rb b/db/migrate/20171017210230_add_product_i_dto_reviews.rb
new file mode 100644
index 0000000000..902c02b81a
--- /dev/null
+++ b/db/migrate/20171017210230_add_product_i_dto_reviews.rb
@@ -0,0 +1,5 @@
+class AddProductIDtoReviews < ActiveRecord::Migration[5.1]
+ def change
+ add_reference :reviews, :product, foreign_keys: true
+ end
+end
diff --git a/db/migrate/20171017210850_add_foreign_keyto_product.rb b/db/migrate/20171017210850_add_foreign_keyto_product.rb
new file mode 100644
index 0000000000..05fe3da402
--- /dev/null
+++ b/db/migrate/20171017210850_add_foreign_keyto_product.rb
@@ -0,0 +1,5 @@
+class AddForeignKeytoProduct < ActiveRecord::Migration[5.1]
+ def change
+ add_reference :products, :user, foreign_keys: true
+ end
+end
diff --git a/db/migrate/20171017211008_add_foreign_keyto_order.rb b/db/migrate/20171017211008_add_foreign_keyto_order.rb
new file mode 100644
index 0000000000..f7ff6113fb
--- /dev/null
+++ b/db/migrate/20171017211008_add_foreign_keyto_order.rb
@@ -0,0 +1,6 @@
+class AddForeignKeytoOrder < ActiveRecord::Migration[5.1]
+ def change
+ add_reference :orders, :user, foreign_keys: true
+ add_reference :orders, :cart, foreign_keys: true
+ end
+end
diff --git a/db/migrate/20171017232721_add_merchant_column.rb b/db/migrate/20171017232721_add_merchant_column.rb
new file mode 100644
index 0000000000..5aff7b2941
--- /dev/null
+++ b/db/migrate/20171017232721_add_merchant_column.rb
@@ -0,0 +1,5 @@
+class AddMerchantColumn < ActiveRecord::Migration[5.1]
+ def change
+ add_column(:users, :merchant_status, :boolean)
+ end
+end
diff --git a/db/migrate/20171017234725_add_ui_dand_provider_to_users.rb b/db/migrate/20171017234725_add_ui_dand_provider_to_users.rb
new file mode 100644
index 0000000000..92f8cb4676
--- /dev/null
+++ b/db/migrate/20171017234725_add_ui_dand_provider_to_users.rb
@@ -0,0 +1,6 @@
+class AddUiDandProviderToUsers < ActiveRecord::Migration[5.1]
+ def change
+ add_column :users, :uid, :string, null: false
+ add_column :users, :provider, :string, null: false
+ end
+end
diff --git a/db/migrate/20171019011348_create_order_items.rb b/db/migrate/20171019011348_create_order_items.rb
new file mode 100644
index 0000000000..db8b5cfa57
--- /dev/null
+++ b/db/migrate/20171019011348_create_order_items.rb
@@ -0,0 +1,9 @@
+class CreateOrderItems < ActiveRecord::Migration[5.1]
+ def change
+ create_table :order_items do |t|
+ t.integer :quantity
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171019165620_remove_userid_from_order.rb b/db/migrate/20171019165620_remove_userid_from_order.rb
new file mode 100644
index 0000000000..b978c70eb0
--- /dev/null
+++ b/db/migrate/20171019165620_remove_userid_from_order.rb
@@ -0,0 +1,6 @@
+class RemoveUseridFromOrder < ActiveRecord::Migration[5.1]
+ def change
+ remove_column :orders, :user_id, :string
+
+ end
+end
diff --git a/db/migrate/20171019165910_add_userid_to_order.rb b/db/migrate/20171019165910_add_userid_to_order.rb
new file mode 100644
index 0000000000..3f13cb18ca
--- /dev/null
+++ b/db/migrate/20171019165910_add_userid_to_order.rb
@@ -0,0 +1,5 @@
+class AddUseridToOrder < ActiveRecord::Migration[5.1]
+ def change
+ add_column :orders, :user_id, :bigint
+ end
+end
diff --git a/db/migrate/20171019172247_remove_cart_id_association_orders.rb b/db/migrate/20171019172247_remove_cart_id_association_orders.rb
new file mode 100644
index 0000000000..e6b24adc04
--- /dev/null
+++ b/db/migrate/20171019172247_remove_cart_id_association_orders.rb
@@ -0,0 +1,5 @@
+class RemoveCartIdAssociationOrders < ActiveRecord::Migration[5.1]
+ def change
+ remove_column :orders, :cart_id
+ end
+end
diff --git a/db/migrate/20171019203518_create_categories.rb b/db/migrate/20171019203518_create_categories.rb
new file mode 100644
index 0000000000..5bef4913b8
--- /dev/null
+++ b/db/migrate/20171019203518_create_categories.rb
@@ -0,0 +1,9 @@
+class CreateCategories < ActiveRecord::Migration[5.1]
+ def change
+ create_table :categories do |t|
+ t.string :name
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171019213116_create_products_categories_join.rb b/db/migrate/20171019213116_create_products_categories_join.rb
new file mode 100644
index 0000000000..3d5f210962
--- /dev/null
+++ b/db/migrate/20171019213116_create_products_categories_join.rb
@@ -0,0 +1,9 @@
+class CreateProductsCategoriesJoin < ActiveRecord::Migration[5.1]
+ def change
+ create_table :products_categories do |t|
+ t.belongs_to :product, index: true
+ t.belongs_to :category, index: true
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20171019225654_rename_category_product_join_table.rb b/db/migrate/20171019225654_rename_category_product_join_table.rb
new file mode 100644
index 0000000000..b04a2416e9
--- /dev/null
+++ b/db/migrate/20171019225654_rename_category_product_join_table.rb
@@ -0,0 +1,5 @@
+class RenameCategoryProductJoinTable < ActiveRecord::Migration[5.1]
+ def change
+ rename_table :products_categories, :categories_products
+ end
+end
diff --git a/db/migrate/20171020021626_add_order_i_dto_order_items.rb b/db/migrate/20171020021626_add_order_i_dto_order_items.rb
new file mode 100644
index 0000000000..806d91f37b
--- /dev/null
+++ b/db/migrate/20171020021626_add_order_i_dto_order_items.rb
@@ -0,0 +1,6 @@
+class AddOrderIDtoOrderItems < ActiveRecord::Migration[5.1]
+ def change
+ # add_column :order_items, :order_id, :bigint
+ add_reference :order_items, :order, foreign_keys: true
+ end
+end
diff --git a/db/migrate/20171020025105_add_user_info_to_order.rb b/db/migrate/20171020025105_add_user_info_to_order.rb
new file mode 100644
index 0000000000..e89e5a5dd7
--- /dev/null
+++ b/db/migrate/20171020025105_add_user_info_to_order.rb
@@ -0,0 +1,11 @@
+class AddUserInfoToOrder < ActiveRecord::Migration[5.1]
+ def change
+ add_column :orders, :customer_name, :string
+ add_column :orders, :email, :string
+ add_column :orders, :mailing_address, :string
+ add_column :orders, :cc_number, :string
+ add_column :orders, :cc_expiration_date, :string
+ add_column :orders, :cc_cvv, :string
+ add_column :orders, :zipcode, :string
+ end
+end
diff --git a/db/migrate/20171024170127_add_stock_and_photo_ur_lto_products.rb b/db/migrate/20171024170127_add_stock_and_photo_ur_lto_products.rb
new file mode 100644
index 0000000000..b9f5667a21
--- /dev/null
+++ b/db/migrate/20171024170127_add_stock_and_photo_ur_lto_products.rb
@@ -0,0 +1,6 @@
+class AddStockAndPhotoUrLtoProducts < ActiveRecord::Migration[5.1]
+ def change
+ add_column :products, :stock, :string
+ add_column :products, :photo_url, :string
+ end
+end
diff --git a/db/migrate/20171024233848_add_image_to_products.rb b/db/migrate/20171024233848_add_image_to_products.rb
new file mode 100644
index 0000000000..fa440a9afd
--- /dev/null
+++ b/db/migrate/20171024233848_add_image_to_products.rb
@@ -0,0 +1,13 @@
+class AddImageToProducts < ActiveRecord::Migration[5.1]
+ def change
+ add_attachment :products, :photo
+ end
+
+ def self.up
+ add_attachment :products, :photo
+ end
+
+ def self.down
+ remove_attachment :products, :photo
+ end
+end
diff --git a/db/migrate/20171024234020_add_shipped_to_order_items.rb b/db/migrate/20171024234020_add_shipped_to_order_items.rb
new file mode 100644
index 0000000000..36b06ac9ab
--- /dev/null
+++ b/db/migrate/20171024234020_add_shipped_to_order_items.rb
@@ -0,0 +1,5 @@
+class AddShippedToOrderItems < ActiveRecord::Migration[5.1]
+ def change
+ add_column :order_items, :shipped, :string
+ end
+end
diff --git a/db/migrate/20171025100622_remove_extras_from_users.rb b/db/migrate/20171025100622_remove_extras_from_users.rb
new file mode 100644
index 0000000000..57558167e6
--- /dev/null
+++ b/db/migrate/20171025100622_remove_extras_from_users.rb
@@ -0,0 +1,9 @@
+class RemoveExtrasFromUsers < ActiveRecord::Migration[5.1]
+ def change
+ remove_column :users, :mailing_address, :string
+ remove_column :users, :cc_number, :string
+ remove_column :users, :cc_expiration_date, :date
+ remove_column :users, :cc_cvv, :integer
+ remove_column :users, :zipcode, :string
+ end
+end
diff --git a/db/migrate/20171025101959_add_default_to_shipped_orderitem.rb b/db/migrate/20171025101959_add_default_to_shipped_orderitem.rb
new file mode 100644
index 0000000000..d3dd037c4c
--- /dev/null
+++ b/db/migrate/20171025101959_add_default_to_shipped_orderitem.rb
@@ -0,0 +1,5 @@
+class AddDefaultToShippedOrderitem < ActiveRecord::Migration[5.1]
+ def change
+ change_column_default :order_items, :shipped, "not shipped"
+ end
+end
diff --git a/db/migrate/20171025102333_add_default_to_product_stock.rb b/db/migrate/20171025102333_add_default_to_product_stock.rb
new file mode 100644
index 0000000000..b89c93cca1
--- /dev/null
+++ b/db/migrate/20171025102333_add_default_to_product_stock.rb
@@ -0,0 +1,5 @@
+class AddDefaultToProductStock < ActiveRecord::Migration[5.1]
+ def change
+ change_column_default :products, :stock, "In Stock"
+ end
+end
diff --git a/db/migrate/20171025103400_add_default_to_order_status.rb b/db/migrate/20171025103400_add_default_to_order_status.rb
new file mode 100644
index 0000000000..603466a226
--- /dev/null
+++ b/db/migrate/20171025103400_add_default_to_order_status.rb
@@ -0,0 +1,5 @@
+class AddDefaultToOrderStatus < ActiveRecord::Migration[5.1]
+ def change
+ change_column_default :orders, :status, "incomplete"
+ end
+end
diff --git a/db/migrate/20171025104952_remove_photourl_from_products.rb b/db/migrate/20171025104952_remove_photourl_from_products.rb
new file mode 100644
index 0000000000..293f91047f
--- /dev/null
+++ b/db/migrate/20171025104952_remove_photourl_from_products.rb
@@ -0,0 +1,5 @@
+class RemovePhotourlFromProducts < ActiveRecord::Migration[5.1]
+ def change
+ remove_column :products, :photo_url, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000000..f49db81f87
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,96 @@
+# 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: 20171025104952) do
+
+ # These are extensions that must be enabled in order to support this database
+ enable_extension "plpgsql"
+
+ create_table "categories", force: :cascade do |t|
+ t.string "name"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "categories_products", force: :cascade do |t|
+ t.bigint "product_id"
+ t.bigint "category_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["category_id"], name: "index_categories_products_on_category_id"
+ t.index ["product_id"], name: "index_categories_products_on_product_id"
+ end
+
+ create_table "order_items", force: :cascade do |t|
+ t.integer "quantity"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.bigint "product_id"
+ t.bigint "order_id"
+ t.string "shipped", default: "not shipped"
+ t.index ["order_id"], name: "index_order_items_on_order_id"
+ t.index ["product_id"], name: "index_order_items_on_product_id"
+ end
+
+ create_table "orders", force: :cascade do |t|
+ t.string "status", default: "incomplete"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.bigint "user_id"
+ t.string "customer_name"
+ t.string "email"
+ t.string "mailing_address"
+ t.string "cc_number"
+ t.string "cc_expiration_date"
+ t.string "cc_cvv"
+ t.string "zipcode"
+ end
+
+ create_table "products", force: :cascade do |t|
+ t.string "name"
+ t.string "category"
+ t.text "description"
+ t.decimal "price"
+ t.integer "quantity"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.bigint "user_id"
+ t.string "stock", default: "In Stock"
+ t.string "photo_file_name"
+ t.string "photo_content_type"
+ t.integer "photo_file_size"
+ t.datetime "photo_updated_at"
+ t.index ["user_id"], name: "index_products_on_user_id"
+ end
+
+ create_table "reviews", force: :cascade do |t|
+ t.integer "rating"
+ t.text "text_review"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.bigint "user_id"
+ t.bigint "product_id"
+ t.index ["product_id"], name: "index_reviews_on_product_id"
+ t.index ["user_id"], name: "index_reviews_on_user_id"
+ end
+
+ create_table "users", force: :cascade do |t|
+ t.string "name"
+ t.string "email"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.boolean "merchant_status"
+ t.string "uid", null: false
+ t.string "provider", null: false
+ end
+
+end
diff --git a/db/seed_data/categories.csv b/db/seed_data/categories.csv
new file mode 100644
index 0000000000..8d9f2472e8
--- /dev/null
+++ b/db/seed_data/categories.csv
@@ -0,0 +1,4 @@
+id,name
+1,food
+2,cosmetics
+3,clothing
diff --git a/db/seed_data/product_seeds.csv b/db/seed_data/product_seeds.csv
new file mode 100644
index 0000000000..b02e88ebcb
--- /dev/null
+++ b/db/seed_data/product_seeds.csv
@@ -0,0 +1,15 @@
+category,name,price,quantity,user_id,stock,description
+food,Franz Chocolates,199.99,30,999,In Stock,An Obama family favorite.
+food,Countdown to Ecstasy,500.00,5,999,In Stock,A guaranteed trip to flavor town.
+food,Pretzel Logic,100.00,10,999,In Stock,Pretzels that temporarily make you smarter
+food,Snickers,150.00,100,999,In Stock,The classic
+cosmetics,Polygraph Perfume,1000.00,3,1000,In Stock,Spritz this for the Truth.
+cosmetics,Luxe Lipstick,150.00,10,1000,In Stock,The most luxurious feeling and looking lipstick on the market.
+cosmetics,Bashful Blush,100.00,20,1000,In Stock,For a light and charming flush of color.
+cosmetics,Eyeluring Eyeliner,120.00,10,1000,In Stock,Make eyes and catch eyes.
+cosmetics,Flawless Foundation,180.00,15,1000,In Stock, For flawless skin
+clothing,The Perfect Tee,100.00,80,1001,In Stock,Basic tee that looks flattering on everybody.
+clothing,Blazing Bolo,500.00,3,1001,In Stock,Bolos that give the illusion that they are on fire.
+clothing,Never-Stretch Leggings,300.00,18,1001,In Stock,Leggings that will never lose their shape.
+clothing,Perfect Pants,700.00,20,1001,In Stock,Pants that look flattering on everybody.
+clothing,Punchy Poncho,550.00,3,1001,In Stock,The punchiest poncho to add oomph to any outfit.
diff --git a/db/seed_data/users.csv b/db/seed_data/users.csv
new file mode 100644
index 0000000000..2d62193fb5
--- /dev/null
+++ b/db/seed_data/users.csv
@@ -0,0 +1,4 @@
+id,name,email,merchant_status,uid,provider
+999,Nina Hintz,hintz@ada.com,true,999999,github
+1000,Florence Fisher,fisher@ada.com,true,999998,github
+1001,Glitzy Team, glitzy@ada.com,true,999997,github
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 0000000000..dc1d459889
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,142 @@
+# 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 rails db:seed command (or created alongside the database with db:setup).
+#
+# Examples:
+#
+# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+# Character.create(name: 'Luke', movie: movies.first)
+
+require 'csv'
+
+#---------------------------------------------------
+CATEGORY_FILE = Rails.root.join('db', 'seed_data', 'categories.csv')
+puts "Loading raw work data from #{CATEGORY_FILE}"
+
+category_failures = []
+CSV.foreach(CATEGORY_FILE, :headers => true) do |row|
+ category = Category.new
+ category.id = row['id']
+ category.name = row['name']
+
+ puts "Created work: #{category.inspect}"
+ successful = category.save
+ if !successful
+ category_failures << category
+ puts category.errors
+ puts "----------"
+ category.errors.each do |column, message|
+ puts "#{column}: #{message}"
+ end
+ puts "----------"
+ end
+
+end
+
+puts "Added #{Category.count} category records"
+puts "#{category_failures.length} category failed to save"
+
+
+# Since we set the primary key (the ID) manually on each of the
+# tables, we've got to tell postgres to reload the latest ID
+# values. Otherwise when we create a new record it will try
+# to start at ID 1, which will be a conflict.
+puts "Manually resetting PK sequence on each table"
+ActiveRecord::Base.connection.tables.each do |t|
+ ActiveRecord::Base.connection.reset_pk_sequence!(t)
+end
+
+puts "done"
+
+
+#---------------------------------------------------
+USER_FILE = Rails.root.join('db', 'seed_data', 'users.csv')
+puts "Loading raw work data from #{USER_FILE}"
+
+user_failures = []
+CSV.foreach(USER_FILE, :headers => true) do |row|
+ user = User.new
+ user.id = row['id']
+ user.name = row['name']
+ user.email = row['email']
+ user.merchant_status = row['merchant_status']
+ user.uid = row['uid']
+ user.provider = row['provider']
+ puts "Created work: #{user.inspect}"
+ successful = user.save
+ if !successful
+ user_failures << user
+ puts user.errors
+ puts "----------"
+ user.errors.each do |column, message|
+ puts "#{column}: #{message}"
+ end
+ puts "----------"
+ end
+
+end
+
+puts "Added #{User.count} user records"
+puts "#{user_failures.length} user failed to save"
+
+
+# Since we set the primary key (the ID) manually on each of the
+# tables, we've got to tell postgres to reload the latest ID
+# values. Otherwise when we create a new record it will try
+# to start at ID 1, which will be a conflict.
+puts "Manually resetting PK sequence on each table"
+ActiveRecord::Base.connection.tables.each do |t|
+ ActiveRecord::Base.connection.reset_pk_sequence!(t)
+end
+
+puts "done"
+
+
+#---------------------------------------------------
+PRODUCT_FILE = Rails.root.join('db', 'seed_data', 'product_seeds.csv')
+puts "Loading raw work data from #{PRODUCT_FILE}"
+
+
+i = 1000
+product_failures = []
+CSV.foreach(PRODUCT_FILE, :headers => true) do |row|
+ product = Product.new
+ product.id = i
+ product.user_id = row['user_id']
+ product.category = row['category']
+ product.name = row['name']
+ product.price = row['price']
+ product.quantity = row['quantity']
+ product.description = row['description']
+ product.stock = row['stock']
+
+ puts "Created work: #{product.inspect}"
+ successful = product.save
+ product.categories << Category.find_by(name: product.category)
+
+ if !successful
+ product_failures << product
+ puts product.errors
+ puts "----------"
+ product.errors.each do |column, message|
+ puts "#{column}: #{message}"
+ end
+ puts "----------"
+ end
+
+ i += 1
+end
+
+puts "Added #{Product.count} product records"
+puts "#{product_failures.length} products failed to save"
+
+
+# Since we set the primary key (the ID) manually on each of the
+# tables, we've got to tell postgres to reload the latest ID
+# values. Otherwise when we create a new record it will try
+# to start at ID 1, which will be a conflict.
+puts "Manually resetting PK sequence on each table"
+ActiveRecord::Base.connection.tables.each do |t|
+ ActiveRecord::Base.connection.reset_pk_sequence!(t)
+end
+
+puts "done"
diff --git a/delete_me.html.erb b/delete_me.html.erb
new file mode 100644
index 0000000000..4250abab12
--- /dev/null
+++ b/delete_me.html.erb
@@ -0,0 +1,72 @@
+
<%= link_to "Add Product to Sell", new_product_path, alt: "link to add product for merchant", class: "button" %>
+
+
<%= link_to "Add New Category", new_category_path, alt: "link to add category for merchant", class: "button" %>
+
+
+
+
diff --git a/erd.pdf b/erd.pdf
new file mode 100644
index 0000000000..d88ab718fc
Binary files /dev/null and b/erd.pdf differ
diff --git a/lib/assets/.keep b/lib/assets/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/log/.keep b/log/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..f874acf437
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+ "name": "betsy",
+ "private": true,
+ "dependencies": {}
+}
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 0000000000..2be3af26fc
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,67 @@
+
+
+
+ The page you were looking for doesn't exist (404)
+
+
+
+
+
+
+
+
+
The page you were looking for doesn't exist.
+
You may have mistyped the address or the page may have moved.
+
+
If you are the application owner check the logs for more information.
+
+
+
diff --git a/public/422.html b/public/422.html
new file mode 100644
index 0000000000..c08eac0d1d
--- /dev/null
+++ b/public/422.html
@@ -0,0 +1,67 @@
+
+
+
+ The change you wanted was rejected (422)
+
+
+
+
+
+
+
+
+
The change you wanted was rejected.
+
Maybe you tried to change something you didn't have access to.
+
+
If you are the application owner check the logs for more information.
+
+
+
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 0000000000..78a030af22
--- /dev/null
+++ b/public/500.html
@@ -0,0 +1,66 @@
+
+
+
+ We're sorry, but something went wrong (500)
+
+
+
+
+
+
+
+
+
We're sorry, but something went wrong.
+
+
If you are the application owner check the logs for more information.
+
+
+
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000000..37b576a4a0
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
diff --git a/public/system/products/photos/000/001/014/medium/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg b/public/system/products/photos/000/001/014/medium/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg
new file mode 100644
index 0000000000..227a7130ba
Binary files /dev/null and b/public/system/products/photos/000/001/014/medium/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg differ
diff --git a/public/system/products/photos/000/001/014/medium/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/014/medium/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..d19836f0d9
Binary files /dev/null and b/public/system/products/photos/000/001/014/medium/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/014/original/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg b/public/system/products/photos/000/001/014/original/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg
new file mode 100644
index 0000000000..09c687f60a
Binary files /dev/null and b/public/system/products/photos/000/001/014/original/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg differ
diff --git a/public/system/products/photos/000/001/014/original/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/014/original/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..9dd6759737
Binary files /dev/null and b/public/system/products/photos/000/001/014/original/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/014/square/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg b/public/system/products/photos/000/001/014/square/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg
new file mode 100644
index 0000000000..2bfdf98588
Binary files /dev/null and b/public/system/products/photos/000/001/014/square/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg differ
diff --git a/public/system/products/photos/000/001/014/square/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/014/square/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..d19836f0d9
Binary files /dev/null and b/public/system/products/photos/000/001/014/square/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/014/thumb/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg b/public/system/products/photos/000/001/014/thumb/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg
new file mode 100644
index 0000000000..8b71579982
Binary files /dev/null and b/public/system/products/photos/000/001/014/thumb/8.-Sferra-Palace-Ivory-1020-TC-620-1_copy.jpg differ
diff --git a/public/system/products/photos/000/001/014/thumb/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/014/thumb/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..1aed3056b0
Binary files /dev/null and b/public/system/products/photos/000/001/014/thumb/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/015/medium/Dior-Reveries-Haute-Couture2.jpg b/public/system/products/photos/000/001/015/medium/Dior-Reveries-Haute-Couture2.jpg
new file mode 100644
index 0000000000..5a1961bfea
Binary files /dev/null and b/public/system/products/photos/000/001/015/medium/Dior-Reveries-Haute-Couture2.jpg differ
diff --git a/public/system/products/photos/000/001/015/original/Dior-Reveries-Haute-Couture2.jpg b/public/system/products/photos/000/001/015/original/Dior-Reveries-Haute-Couture2.jpg
new file mode 100644
index 0000000000..00278fecac
Binary files /dev/null and b/public/system/products/photos/000/001/015/original/Dior-Reveries-Haute-Couture2.jpg differ
diff --git a/public/system/products/photos/000/001/015/square/Dior-Reveries-Haute-Couture2.jpg b/public/system/products/photos/000/001/015/square/Dior-Reveries-Haute-Couture2.jpg
new file mode 100644
index 0000000000..66bacc09a9
Binary files /dev/null and b/public/system/products/photos/000/001/015/square/Dior-Reveries-Haute-Couture2.jpg differ
diff --git a/public/system/products/photos/000/001/015/thumb/Dior-Reveries-Haute-Couture2.jpg b/public/system/products/photos/000/001/015/thumb/Dior-Reveries-Haute-Couture2.jpg
new file mode 100644
index 0000000000..f9669b264d
Binary files /dev/null and b/public/system/products/photos/000/001/015/thumb/Dior-Reveries-Haute-Couture2.jpg differ
diff --git a/public/system/products/photos/000/001/016/medium/la_prairie.jpg b/public/system/products/photos/000/001/016/medium/la_prairie.jpg
new file mode 100644
index 0000000000..b71466d8ed
Binary files /dev/null and b/public/system/products/photos/000/001/016/medium/la_prairie.jpg differ
diff --git a/public/system/products/photos/000/001/016/medium/spice-world.jpg b/public/system/products/photos/000/001/016/medium/spice-world.jpg
new file mode 100644
index 0000000000..c918e78c9c
Binary files /dev/null and b/public/system/products/photos/000/001/016/medium/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/016/original/la_prairie.jpg b/public/system/products/photos/000/001/016/original/la_prairie.jpg
new file mode 100644
index 0000000000..6467d62264
Binary files /dev/null and b/public/system/products/photos/000/001/016/original/la_prairie.jpg differ
diff --git a/public/system/products/photos/000/001/016/original/spice-world.jpg b/public/system/products/photos/000/001/016/original/spice-world.jpg
new file mode 100644
index 0000000000..4444b99b8a
Binary files /dev/null and b/public/system/products/photos/000/001/016/original/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/016/square/la_prairie.jpg b/public/system/products/photos/000/001/016/square/la_prairie.jpg
new file mode 100644
index 0000000000..acd31ef43f
Binary files /dev/null and b/public/system/products/photos/000/001/016/square/la_prairie.jpg differ
diff --git a/public/system/products/photos/000/001/016/square/spice-world.jpg b/public/system/products/photos/000/001/016/square/spice-world.jpg
new file mode 100644
index 0000000000..a9a56b4fb1
Binary files /dev/null and b/public/system/products/photos/000/001/016/square/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/016/thumb/la_prairie.jpg b/public/system/products/photos/000/001/016/thumb/la_prairie.jpg
new file mode 100644
index 0000000000..b971ed75d2
Binary files /dev/null and b/public/system/products/photos/000/001/016/thumb/la_prairie.jpg differ
diff --git a/public/system/products/photos/000/001/016/thumb/spice-world.jpg b/public/system/products/photos/000/001/016/thumb/spice-world.jpg
new file mode 100644
index 0000000000..f9e112b334
Binary files /dev/null and b/public/system/products/photos/000/001/016/thumb/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/017/medium/grapefruitjuice.jpg b/public/system/products/photos/000/001/017/medium/grapefruitjuice.jpg
new file mode 100644
index 0000000000..9b7f681aca
Binary files /dev/null and b/public/system/products/photos/000/001/017/medium/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/017/original/grapefruitjuice.jpg b/public/system/products/photos/000/001/017/original/grapefruitjuice.jpg
new file mode 100644
index 0000000000..195347089a
Binary files /dev/null and b/public/system/products/photos/000/001/017/original/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/017/square/grapefruitjuice.jpg b/public/system/products/photos/000/001/017/square/grapefruitjuice.jpg
new file mode 100644
index 0000000000..fb04352c6f
Binary files /dev/null and b/public/system/products/photos/000/001/017/square/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/017/thumb/grapefruitjuice.jpg b/public/system/products/photos/000/001/017/thumb/grapefruitjuice.jpg
new file mode 100644
index 0000000000..0a743e7da5
Binary files /dev/null and b/public/system/products/photos/000/001/017/thumb/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/018/medium/hopediamond.jpg b/public/system/products/photos/000/001/018/medium/hopediamond.jpg
new file mode 100644
index 0000000000..b313ffca74
Binary files /dev/null and b/public/system/products/photos/000/001/018/medium/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/018/original/hopediamond.jpg b/public/system/products/photos/000/001/018/original/hopediamond.jpg
new file mode 100644
index 0000000000..42b19905f9
Binary files /dev/null and b/public/system/products/photos/000/001/018/original/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/018/square/hopediamond.jpg b/public/system/products/photos/000/001/018/square/hopediamond.jpg
new file mode 100644
index 0000000000..da7cadf349
Binary files /dev/null and b/public/system/products/photos/000/001/018/square/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/018/thumb/hopediamond.jpg b/public/system/products/photos/000/001/018/thumb/hopediamond.jpg
new file mode 100644
index 0000000000..a9636620a3
Binary files /dev/null and b/public/system/products/photos/000/001/018/thumb/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/019/medium/spice-world.jpg b/public/system/products/photos/000/001/019/medium/spice-world.jpg
new file mode 100644
index 0000000000..c918e78c9c
Binary files /dev/null and b/public/system/products/photos/000/001/019/medium/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/019/original/spice-world.jpg b/public/system/products/photos/000/001/019/original/spice-world.jpg
new file mode 100644
index 0000000000..4444b99b8a
Binary files /dev/null and b/public/system/products/photos/000/001/019/original/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/019/square/spice-world.jpg b/public/system/products/photos/000/001/019/square/spice-world.jpg
new file mode 100644
index 0000000000..a9a56b4fb1
Binary files /dev/null and b/public/system/products/photos/000/001/019/square/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/019/thumb/spice-world.jpg b/public/system/products/photos/000/001/019/thumb/spice-world.jpg
new file mode 100644
index 0000000000..f9e112b334
Binary files /dev/null and b/public/system/products/photos/000/001/019/thumb/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/020/large/grapefruitjuice.jpg b/public/system/products/photos/000/001/020/large/grapefruitjuice.jpg
new file mode 100644
index 0000000000..25e91ad06d
Binary files /dev/null and b/public/system/products/photos/000/001/020/large/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/020/medium/grapefruitjuice.jpg b/public/system/products/photos/000/001/020/medium/grapefruitjuice.jpg
new file mode 100644
index 0000000000..9b7f681aca
Binary files /dev/null and b/public/system/products/photos/000/001/020/medium/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/020/original/grapefruitjuice.jpg b/public/system/products/photos/000/001/020/original/grapefruitjuice.jpg
new file mode 100644
index 0000000000..195347089a
Binary files /dev/null and b/public/system/products/photos/000/001/020/original/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/020/square/grapefruitjuice.jpg b/public/system/products/photos/000/001/020/square/grapefruitjuice.jpg
new file mode 100644
index 0000000000..fb04352c6f
Binary files /dev/null and b/public/system/products/photos/000/001/020/square/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/020/thumb/grapefruitjuice.jpg b/public/system/products/photos/000/001/020/thumb/grapefruitjuice.jpg
new file mode 100644
index 0000000000..0a743e7da5
Binary files /dev/null and b/public/system/products/photos/000/001/020/thumb/grapefruitjuice.jpg differ
diff --git a/public/system/products/photos/000/001/021/medium/hopediamond.jpg b/public/system/products/photos/000/001/021/medium/hopediamond.jpg
new file mode 100644
index 0000000000..b313ffca74
Binary files /dev/null and b/public/system/products/photos/000/001/021/medium/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/021/original/hopediamond.jpg b/public/system/products/photos/000/001/021/original/hopediamond.jpg
new file mode 100644
index 0000000000..42b19905f9
Binary files /dev/null and b/public/system/products/photos/000/001/021/original/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/021/square/hopediamond.jpg b/public/system/products/photos/000/001/021/square/hopediamond.jpg
new file mode 100644
index 0000000000..da7cadf349
Binary files /dev/null and b/public/system/products/photos/000/001/021/square/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/021/thumb/hopediamond.jpg b/public/system/products/photos/000/001/021/thumb/hopediamond.jpg
new file mode 100644
index 0000000000..a9636620a3
Binary files /dev/null and b/public/system/products/photos/000/001/021/thumb/hopediamond.jpg differ
diff --git a/public/system/products/photos/000/001/022/medium/glitzy.jpg b/public/system/products/photos/000/001/022/medium/glitzy.jpg
new file mode 100644
index 0000000000..c718915bf5
Binary files /dev/null and b/public/system/products/photos/000/001/022/medium/glitzy.jpg differ
diff --git a/public/system/products/photos/000/001/022/original/glitzy.jpg b/public/system/products/photos/000/001/022/original/glitzy.jpg
new file mode 100644
index 0000000000..3a704d8176
Binary files /dev/null and b/public/system/products/photos/000/001/022/original/glitzy.jpg differ
diff --git a/public/system/products/photos/000/001/022/square/glitzy.jpg b/public/system/products/photos/000/001/022/square/glitzy.jpg
new file mode 100644
index 0000000000..665bc204d1
Binary files /dev/null and b/public/system/products/photos/000/001/022/square/glitzy.jpg differ
diff --git a/public/system/products/photos/000/001/022/thumb/glitzy.jpg b/public/system/products/photos/000/001/022/thumb/glitzy.jpg
new file mode 100644
index 0000000000..57e85e6a99
Binary files /dev/null and b/public/system/products/photos/000/001/022/thumb/glitzy.jpg differ
diff --git a/public/system/products/photos/000/001/023/large/spice-world.jpg b/public/system/products/photos/000/001/023/large/spice-world.jpg
new file mode 100644
index 0000000000..b9fe5da07c
Binary files /dev/null and b/public/system/products/photos/000/001/023/large/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/023/medium/spice-world.jpg b/public/system/products/photos/000/001/023/medium/spice-world.jpg
new file mode 100644
index 0000000000..c918e78c9c
Binary files /dev/null and b/public/system/products/photos/000/001/023/medium/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/023/original/spice-world.jpg b/public/system/products/photos/000/001/023/original/spice-world.jpg
new file mode 100644
index 0000000000..4444b99b8a
Binary files /dev/null and b/public/system/products/photos/000/001/023/original/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/023/square/spice-world.jpg b/public/system/products/photos/000/001/023/square/spice-world.jpg
new file mode 100644
index 0000000000..a9a56b4fb1
Binary files /dev/null and b/public/system/products/photos/000/001/023/square/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/023/thumb/spice-world.jpg b/public/system/products/photos/000/001/023/thumb/spice-world.jpg
new file mode 100644
index 0000000000..f9e112b334
Binary files /dev/null and b/public/system/products/photos/000/001/023/thumb/spice-world.jpg differ
diff --git a/public/system/products/photos/000/001/028/medium/Guerlains-KissKiss-Lipstick.jpg b/public/system/products/photos/000/001/028/medium/Guerlains-KissKiss-Lipstick.jpg
new file mode 100644
index 0000000000..63659067ba
Binary files /dev/null and b/public/system/products/photos/000/001/028/medium/Guerlains-KissKiss-Lipstick.jpg differ
diff --git a/public/system/products/photos/000/001/028/original/Guerlains-KissKiss-Lipstick.jpg b/public/system/products/photos/000/001/028/original/Guerlains-KissKiss-Lipstick.jpg
new file mode 100644
index 0000000000..868c17a734
Binary files /dev/null and b/public/system/products/photos/000/001/028/original/Guerlains-KissKiss-Lipstick.jpg differ
diff --git a/public/system/products/photos/000/001/028/square/Guerlains-KissKiss-Lipstick.jpg b/public/system/products/photos/000/001/028/square/Guerlains-KissKiss-Lipstick.jpg
new file mode 100644
index 0000000000..7e7f818159
Binary files /dev/null and b/public/system/products/photos/000/001/028/square/Guerlains-KissKiss-Lipstick.jpg differ
diff --git a/public/system/products/photos/000/001/028/thumb/Guerlains-KissKiss-Lipstick.jpg b/public/system/products/photos/000/001/028/thumb/Guerlains-KissKiss-Lipstick.jpg
new file mode 100644
index 0000000000..72f412e5f6
Binary files /dev/null and b/public/system/products/photos/000/001/028/thumb/Guerlains-KissKiss-Lipstick.jpg differ
diff --git a/public/system/products/photos/000/001/029/medium/Goldvish.jpg b/public/system/products/photos/000/001/029/medium/Goldvish.jpg
new file mode 100644
index 0000000000..3529713533
Binary files /dev/null and b/public/system/products/photos/000/001/029/medium/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/029/medium/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/029/medium/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..22c89c31ae
Binary files /dev/null and b/public/system/products/photos/000/001/029/medium/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/029/original/Goldvish.jpg b/public/system/products/photos/000/001/029/original/Goldvish.jpg
new file mode 100644
index 0000000000..a2c2014803
Binary files /dev/null and b/public/system/products/photos/000/001/029/original/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/029/original/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/029/original/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..d4a7070383
Binary files /dev/null and b/public/system/products/photos/000/001/029/original/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/029/square/Goldvish.jpg b/public/system/products/photos/000/001/029/square/Goldvish.jpg
new file mode 100644
index 0000000000..d46dd472f1
Binary files /dev/null and b/public/system/products/photos/000/001/029/square/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/029/square/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/029/square/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..9dd6759737
Binary files /dev/null and b/public/system/products/photos/000/001/029/square/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/029/thumb/Goldvish.jpg b/public/system/products/photos/000/001/029/thumb/Goldvish.jpg
new file mode 100644
index 0000000000..9d80697912
Binary files /dev/null and b/public/system/products/photos/000/001/029/thumb/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/029/thumb/Sferra-Palace-Ivory-1020-TC.jpg b/public/system/products/photos/000/001/029/thumb/Sferra-Palace-Ivory-1020-TC.jpg
new file mode 100644
index 0000000000..86a15cebff
Binary files /dev/null and b/public/system/products/photos/000/001/029/thumb/Sferra-Palace-Ivory-1020-TC.jpg differ
diff --git a/public/system/products/photos/000/001/030/medium/Goldvish.jpg b/public/system/products/photos/000/001/030/medium/Goldvish.jpg
new file mode 100644
index 0000000000..3529713533
Binary files /dev/null and b/public/system/products/photos/000/001/030/medium/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/030/original/Goldvish.jpg b/public/system/products/photos/000/001/030/original/Goldvish.jpg
new file mode 100644
index 0000000000..a2c2014803
Binary files /dev/null and b/public/system/products/photos/000/001/030/original/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/030/square/Goldvish.jpg b/public/system/products/photos/000/001/030/square/Goldvish.jpg
new file mode 100644
index 0000000000..d46dd472f1
Binary files /dev/null and b/public/system/products/photos/000/001/030/square/Goldvish.jpg differ
diff --git a/public/system/products/photos/000/001/030/thumb/Goldvish.jpg b/public/system/products/photos/000/001/030/thumb/Goldvish.jpg
new file mode 100644
index 0000000000..9d80697912
Binary files /dev/null and b/public/system/products/photos/000/001/030/thumb/Goldvish.jpg differ
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
new file mode 100644
index 0000000000..d19212abd5
--- /dev/null
+++ b/test/application_system_test_case.rb
@@ -0,0 +1,5 @@
+require "test_helper"
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+end
diff --git a/test/controllers/.keep b/test/controllers/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
new file mode 100644
index 0000000000..22758d55c8
--- /dev/null
+++ b/test/controllers/categories_controller_test.rb
@@ -0,0 +1,43 @@
+require "test_helper"
+
+describe CategoriesController do
+ describe "when user is logged in" do
+
+ before do
+ login(users(:tanja))
+ end
+
+ it "should show the new form" do
+ get new_category_path
+ must_respond_with :success
+ end
+
+ it "after create, redirects" do
+ post categories_path, params: { category: {name: "funky"}}
+ must_respond_with :redirect
+ must_redirect_to user_account_path(users(:tanja).id)
+ end
+
+ it " Data should reflect newly created category" do
+ proc {
+ post categories_path, params: { category: {name: "some cat"}}
+ }.must_change 'Category.count', 1
+ end
+
+
+ it " Should render template and not affect the data if failed " do
+ proc {
+ post categories_path, params: { category: {name: ""}}
+ }
+ end
+ end
+
+ describe "when user is not logged in" do
+
+ it " should redirect if user not logged in " do
+ get new_category_path
+ must_respond_with :redirect
+ end
+
+ end
+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..e8b9809087
--- /dev/null
+++ b/test/controllers/order_items_controller_test.rb
@@ -0,0 +1,238 @@
+require "test_helper"
+
+describe OrderItemsController do
+ let(:chocolate1) { order_items(:orderitem1) }
+ let(:soap2) { order_items(:orderitem2)}
+
+ describe "OrderItem#index" do
+ it "succeeds when there are OrderItems" do
+ chocolate1
+ OrderItem.count.must_be :>, 0, "No OrderItems in the test fixtures"
+ get order_items_path
+ must_respond_with :success
+ end
+
+ it "succeeds when there are no OrderItems" do
+ OrderItem.destroy_all
+ get order_items_path
+ must_respond_with :success
+ end
+ end
+
+ describe "OrderItem#new" do
+ it "works" do
+ get new_product_order_item_path(products(:tears).id)
+ must_respond_with :success
+ end
+ end
+
+ describe "OrderItem#edit" do
+ it "works" do
+ get edit_order_item_path(chocolate1.id)
+ must_respond_with :success
+ end
+ end
+
+ describe "OrderItem#create" do
+
+ let(:order) { orders(:pending_order) }
+
+ it "creates an OrderItem with valid data" do
+ order_item_data = {
+ order_item: {
+ quantity: 1,
+ order: order
+ }
+ }
+
+ start_count = OrderItem.count
+ post product_order_items_path(products(:tears).id), params: order_item_data
+
+ must_redirect_to products_path
+ flash[:result_text].must_equal "1 #{products(:tears).name} have been added to your order!"
+ OrderItem.count.must_equal start_count + 1
+ end
+
+ it "renders bad_request and does not update the DB for missing data" do
+ order_item_data = {
+ order_item: {
+ quantity: -1,
+ order: order
+ }
+ }
+
+ start_count = OrderItem.count
+ post product_order_items_path(products(:tears).id), params: order_item_data
+
+ flash[:result_text].must_equal "Error - products not added to your order"
+ must_respond_with :bad_request
+ OrderItem.count.must_equal start_count
+ end
+
+ it "renders 400 bad_request for bogus categories" do
+ order_item_data = {
+ order_item: {
+ product: "",
+ quantity: -1,
+ order: order
+ }
+ }
+
+ start_count = OrderItem.count
+ post product_order_items_path(products(:tears).id), params: order_item_data
+ flash[:result_text].must_equal "Error - products not added to your order"
+ must_respond_with :bad_request
+ OrderItem.count.must_equal start_count
+ end
+ end
+
+ describe "OrderItem#update" do
+
+ it "allows order_item updates for an order with an 'incomplete' status" do
+ #Arrange
+ chocolate1.order.status.must_equal "incomplete"
+ new_quantity = 3
+ oi_update_data = {
+ order_item: {
+ quantity: new_quantity,
+ product: chocolate1.product,
+ order: chocolate1.order
+ }
+ }
+
+ #Action
+ patch order_item_path(chocolate1.id), params: oi_update_data
+
+ #Assert
+ must_respond_with :redirect
+ must_redirect_to order_path(chocolate1.order.id)
+
+ OrderItem.find(chocolate1.id).quantity.must_equal new_quantity
+
+ end
+
+ it "does not allow you to choose a product quantity greater than the number available" do
+ product = chocolate1.product
+ original_quantity= chocolate1.quantity
+
+ oi_update_data = {
+ order_item: {
+ quantity: (product.quantity + 1),
+ product: chocolate1.product,
+ order: chocolate1.order
+ }
+ }
+
+ #Action
+ patch order_item_path(chocolate1.id), params: oi_update_data
+
+ #Assert
+ must_respond_with :bad_request
+ flash[:result_text].must_equal "Error: You must choose a quantity less than or equal to the available quantity (#{product.quantity})"
+ OrderItem.find(chocolate1.id).quantity.must_equal original_quantity
+
+ end
+
+ it "must have a valid quantity to update" do
+
+ invalid = [-1,0]
+ original_quantity= chocolate1.quantity
+
+ invalid.each do |num|
+
+ oi_update_data = {
+ order_item: {
+ quantity: num,
+ product: chocolate1.product,
+ order: chocolate1.order
+ }
+ }
+
+ patch order_item_path(chocolate1.id), params: oi_update_data
+
+ must_respond_with :bad_request
+ OrderItem.find(chocolate1.id).quantity.must_equal original_quantity
+ end
+
+ end
+
+ it "does not allow order_item updates for an order with a 'paid' status" do
+ #Arrange
+ soap2.order.status.must_equal "paid"
+
+ old_quantity = soap2.quantity
+ new_quantity = 3
+ oi_update_data = {
+ order_item: {
+ quantity: new_quantity,
+ product: soap2.product,
+ order: soap2.order
+ }
+ }
+ #Action
+
+ patch order_item_path(soap2.id), params: oi_update_data
+
+ #Assert
+
+ must_respond_with :redirect
+
+ OrderItem.find_by_id(soap2.id).quantity.must_equal old_quantity
+
+ end
+
+ end
+
+ describe "OrderItem#destroy" do
+ let(:incomplete) {orders(:pending_order)}
+ let(:paid) { orders(:paid_order) }
+
+ let(:chocolate1) { order_items(:orderitem1) }
+ let(:soap2) { order_items(:orderitem2) }
+
+
+ it "only deletes an order_item from cart when order status is incomplete" do
+ #Arrange
+ chocolate1.order.status.must_equal "incomplete"
+ #Action
+ delete order_item_path(chocolate1.id)
+ #Assert
+ OrderItem.find_by(id: chocolate1.id).must_be_nil
+ must_redirect_to order_path(incomplete.id)
+
+ end
+
+ it "cannot delete an order_item from cart when order status is paid" do
+ #Arrange
+ soap2.order.status.must_equal "paid"
+ #Action
+ delete order_item_path(soap2.id)
+ #Assert
+ OrderItem.find_by(id: soap2.id).must_equal soap2
+ must_redirect_to order_path(paid.id)
+
+ end
+ end
+
+ describe "OrderItem#mark_shipped" do
+
+ let(:merchant) {users(:je)}
+ let(:merchant_order_item) {order_items(:orderitem4)}
+
+ it "ensures a paid order_item's default shipping status is: not shipped" do
+ login(merchant)
+
+ merchant_order_item.shipped.must_equal "not shipped"
+
+ end
+
+ it "changes order_item's shipping status to: shipped" do
+ login(merchant)
+ merchant_order_item.shipped.must_equal "not shipped"
+
+ patch item_shipped_path(merchant_order_item.id)
+ merchant_order_item.reload
+ merchant_order_item.shipped.must_equal "shipped"
+ end
+ end
+end
diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb
new file mode 100644
index 0000000000..47a36aae08
--- /dev/null
+++ b/test/controllers/orders_controller_test.rb
@@ -0,0 +1,179 @@
+require "test_helper"
+
+describe OrdersController do
+ let(:item1) {order_items(:orderitem1)}
+ let(:item2) {order_items(:orderitem2)}
+ let(:order1) {orders(:pending_order)}
+ let(:order2) {orders(:paid_order)}
+ let(:tanja) {users(:tanja)}
+ let(:amy) {users(:amy)}
+ let(:chocolate) { products(:chocolate) }
+
+
+ describe "Order#index" do
+ it "succeeds when there are Orders" do
+ order1
+ OrderItem.count.must_be :>, 0, "No Orders in the test fixtures"
+ get orders_path
+ must_respond_with :success
+ end
+
+ it "succeeds when there are no Orders" do
+ Order.destroy_all
+ get orders_path
+ must_respond_with :success
+ end
+ end
+
+ describe "Order#new" do
+ it "works" do
+ get new_order_path
+ must_respond_with :success
+ end
+ end
+
+ describe "Order#edit" do
+ it "works" do
+ get edit_order_path(order1.id)
+ must_respond_with :success
+ end
+
+ it "renders 404 not_found for a non-existent order" do
+ id = order1.id
+ order1.destroy
+ get edit_order_path(id)
+ must_respond_with :not_found
+ end
+ end
+
+ describe "Order#show" do
+ it "can view order show page" do
+ get order_path(order1.id)
+ must_respond_with :success
+ end
+ end
+
+ describe "Order#place_order" do
+ it "changes order status to paid with valid inputs" do
+ id = order1.id
+ order_data = {
+ order: {
+ customer_name: order1.customer_name,
+ email: order1.email,
+ mailing_address: order1.mailing_address,
+ cc_number: order1.cc_number,
+ cc_expiration_date: order1.cc_expiration_date,
+ cc_cvv: order1.cc_cvv,
+ zipcode: order1.zipcode,
+ }
+ }
+
+ get root_path
+ order_id = session[:order_id]
+ post product_order_items_path(chocolate.id), params: { order_item: {quantity: 2, product_id: chocolate.id} }
+
+ my_order_item = OrderItem.find_by(order_id: order_id)
+
+ my_order_item.wont_be_nil
+ order = Order.find_by(id: order_id)
+ order.status.must_equal "incomplete"
+ patch place_order_path, params: order_data
+ Order.find_by(id: order_id).status.must_equal "paid"
+
+ end
+
+ it "does not change order status to paid with invalid inputs" do
+ id = order1.id
+ order_data = {
+ order: {
+ customer_name: order1.customer_name,
+ email: order1.email,
+ mailing_address: order1.mailing_address,
+ cc_number: order1.cc_number,
+ cc_expiration_date: order1.cc_expiration_date,
+ cc_cvv: order1.cc_cvv,
+ zipcode: order1.zipcode,
+ }
+ }
+ # order has 0 order items
+ get root_path
+ order_id = session[:order_id]
+ order = Order.find_by(id: order_id)
+ puts "ORDER HAS #{order.order_items.count}"
+ puts "order status is #{order.status}"
+ order.status.must_equal "incomplete"
+ patch place_order_path, params: order_data
+ order.status.must_equal "incomplete"
+ end
+
+ it "deletes quantity of order_item from inventory" do
+ product = Product.find_by_id(chocolate.id)
+ count = product.quantity
+
+ id = order1.id
+ order_data = {
+ order: {
+ customer_name: order1.customer_name,
+ email: order1.email,
+ mailing_address: order1.mailing_address,
+ cc_number: order1.cc_number,
+ cc_expiration_date: order1.cc_expiration_date,
+ cc_cvv: order1.cc_cvv,
+ zipcode: order1.zipcode,
+ }
+ }
+
+ get root_path
+ order_id = session[:order_id]
+ post product_order_items_path(chocolate.id), params: { order_item: {quantity: 2, product_id: chocolate.id} }
+
+ my_order_item = OrderItem.find_by(order_id: order_id)
+
+ order = Order.find_by(id: order_id)
+
+ patch place_order_path, params: order_data
+
+ product_after = Product.find_by_id(chocolate.id)
+
+ product_after.quantity.must_equal count - 2
+
+ end
+
+ it "does not delete if quantity of order_item is more than inventory" do
+ product = Product.find_by_id(chocolate.id)
+ count = product.quantity
+
+ id = order1.id
+ order_data = {
+ order: {
+ customer_name: order1.customer_name,
+ email: order1.email,
+ mailing_address: order1.mailing_address,
+ cc_number: order1.cc_number,
+ cc_expiration_date: order1.cc_expiration_date,
+ cc_cvv: order1.cc_cvv,
+ zipcode: order1.zipcode,
+ }
+ }
+
+ get root_path
+ order_id = session[:order_id]
+ post product_order_items_path(chocolate.id), params: { order_item: {quantity: 100, product_id: chocolate.id} }
+
+ my_order_item = OrderItem.find_by(order_id: order_id)
+
+ order = Order.find_by(id: order_id)
+
+ patch place_order_path, params: order_data
+
+ product_after = Product.find_by_id(chocolate.id)
+
+ product_after.quantity.must_equal count
+
+ end
+
+ end
+
+
+
+end
diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb
new file mode 100644
index 0000000000..7aadb0e200
--- /dev/null
+++ b/test/controllers/products_controller_test.rb
@@ -0,0 +1,192 @@
+require "test_helper"
+
+describe ProductsController do
+
+ describe "index" do
+ it "allows you to see products when products exist" do
+ Product.count.must_be :>, 0, "No products"
+ get products_path
+ must_respond_with :success
+ end
+
+ it "still succceeds when there are no products" do
+ Product.destroy_all
+ get products_path
+ must_respond_with :success
+ end
+ end
+
+ describe "new" do
+ it "will allow you to see a form to create a new product" do
+ get new_product_path
+ must_respond_with :success
+ end
+ end
+
+ describe "create" do
+ let(:tanja) {users(:tanja)}
+
+ it "for logged in user, will create a new product with valid input" do
+ start_count = Product.count
+ login(tanja)
+
+
+ product_data = {
+ product: {
+ name: "Snakeskin pants",
+ categories: [categories(:clothing).id, categories(:food).id],
+ price: 999.99,
+ quantity: 2,
+ stock: "In Stock",
+ user: tanja
+ }
+ }
+
+ post products_path, params: product_data
+ new_product = Product.last
+ # puts new_product.name
+ must_redirect_to product_path(new_product.id)
+ Product.count.must_equal start_count + 1
+ end
+
+ it "will not create a product if user is not logged in" do
+ start_count = Product.count
+
+ product_data = {
+ product: {
+ name: "Snakeskin pants",
+ categories: [categories(:clothing).id, categories(:food).id],
+ price: 999.99,
+ quantity: 2,
+ stock: "In Stock",
+ user: tanja
+ }
+ }
+
+ post products_path, params: product_data
+ Product.count.must_equal start_count
+ flash[:result_text].must_equal "Error: Product was not added"
+ end
+ end
+
+ describe "show" do
+ it "will go to an existing product's page" do
+ get product_path(Product.first.id)
+ must_respond_with :success
+ end
+
+ it "will render 404 if the product does not exist" do
+ nonexistant_id = ((Product.last).id) + 1
+
+ get product_path(nonexistant_id)
+ must_respond_with :not_found
+ end
+
+ end
+
+ describe "edit" do
+ it "will get the edit form for an existing product" do
+ get edit_product_path(Product.first)
+
+ must_respond_with :success
+ end
+
+ it "renders bad_request and does not pull up an edit form for a nonexistant product" do
+ last_product_id = Product.last.id
+ p last_product_id
+ # nonexistant_product = Product.find_by(id: (last_product_id + 1) )
+ get edit_product_path((last_product_id + 1))
+ must_respond_with :not_found
+ end
+
+ end
+
+ describe "update" do
+
+ it "updates with valid data and an existing product " do
+ product = products(:chocolate)
+ product_data = {
+ product: {
+ name: product.name + " 2",
+ categories: [categories(:food)],
+ description: "Chocolate with gold inside",
+ price: 15.00,
+ quantity: 10,
+ user: users(:tanja),
+ }
+ }
+
+ patch product_path(product), params: product_data
+ must_redirect_to product_path(product)
+
+ # Verify the DB was really modified
+ Product.find(product.id).name.must_equal product_data[:product][:name]
+ Product.find(product.id).price.must_equal product_data[:product][:price]
+ end
+
+ it "does not update with bogus data and an existing product " do
+ product = products(:soap)
+ product_data = {
+ product: {
+ name: "",
+ categories: [categories(:food)],
+ description: "Chocolate with gold inside",
+ price: 15.00,
+ quantity: 10,
+ user: users(:tanja),
+ }
+ }
+
+ patch product_path(product), params: product_data
+ must_respond_with :not_found
+
+ # Verify the DB was really modified
+ Product.find(product.id).name.must_equal product.name
+
+ end
+
+ it "only allows the product owner to edit" do
+ p "Test and functionality must be implemented"
+
+ end
+
+ it "handles bad data" do
+ valid_name = products(:yacht).name
+ put product_path(products(:yacht).id), params: { product: {name: "",categories: [categories(:food), categories(:transportation)] ,description: "Great yacht!",quantity: 100,price: 12400.00, user: users(:tanja)}}
+ yacht = Product.find_by_id(products(:yacht).id)
+ new_name = yacht.name
+ new_name.must_equal valid_name
+ end
+
+ end
+
+ describe "destroy" do
+ it "successfully destroys an existing work" do
+ product_id = Product.first.id
+
+ delete product_path(product_id)
+ must_redirect_to root_path
+
+ # The work should really be gone
+ Product.find_by(id: product_id).must_be_nil
+ end
+ end
+
+
+ describe "guest" do
+ it "allows guest to go to the index page" do
+ get products_path
+
+ must_respond_with :success
+ end
+
+ it "allows guest to go to a product's show page" do
+ product = products(:soap)
+ get product_path(product)
+
+ must_respond_with :success
+
+ end
+
+ end
+end
diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb
new file mode 100644
index 0000000000..76ea660691
--- /dev/null
+++ b/test/controllers/reviews_controller_test.rb
@@ -0,0 +1,358 @@
+require "test_helper"
+
+describe ReviewsController do
+ let(:product) { products(:soap) }
+ let(:review) { reviews(:one) }
+ let(:guest_review) { reviews(:guest_review) }
+
+ let(:merchant) { users(:je) }
+ let(:another_user) {users(:amy)}
+ let(:merchant_product) { products(:candy2) }
+ let(:merchant_product_review) {reviews(:candy2_review)}
+
+ describe "reviews#index" do
+ #get reviews_path
+ # #assert
+ # must_respond_with :success
+ end
+
+ describe "reviews#new" do
+ it "makes a new review from product's show page" do
+ get new_product_review_path(product.id)
+ must_respond_with :success
+ end
+ end
+
+ describe "reviews#create" do
+
+ it "creates a review with valid data (must have rating and product_id)" do
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5
+ }
+ }
+
+ start_count = Review.count
+
+ post product_reviews_path(review_data[:review][:product_id]), params: review_data
+
+ Review.count.must_equal start_count + 1
+
+ end
+
+ it "renders bad_request: review is not created without rating" do
+ review_data = {
+ review: {
+ product_id: product.id
+ }
+ }
+
+ start_count = Review.count
+
+ post product_reviews_path(review_data[:review][:product_id]), params: review_data
+
+ flash[:result_text].must_equal("Error: Could not create your review.")
+ must_respond_with :bad_request
+ Review.count.must_equal start_count
+ end
+
+ it "merchants cannot review their own product" do
+ login(merchant)
+
+ review_data = {
+ review: {
+ product_id: merchant_product.id
+ }
+ }
+
+ start_count = Review.count
+
+ post product_reviews_path(review_data[:review][:product_id]), params: review_data
+
+ Review.count.must_equal start_count
+ flash[:result_text].must_equal "Edit Permissions Denied: As a merchant, you cannot review your own products."
+
+ must_redirect_to product_path(merchant_product.id)
+ end
+
+ it "merchants can review other merchants' products " do
+ login(merchant)
+
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5
+ }
+ }
+
+ start_count = Review.count
+
+ post product_reviews_path(review_data[:review][:product_id]), params: review_data
+
+ Review.count.must_equal start_count + 1
+
+ flash[:result_text].must_equal "Successfully created your review!"
+
+ must_redirect_to review_path(Review.last.id)
+ end
+
+ end
+
+ describe "reviews#show" do
+
+ it "successfully shows a review page (using review_id)" do
+ get review_path(Review.first)
+ must_respond_with :success
+ end
+
+ it "renders 404 not_found for a bogus review_id" do
+ bogus_review_id = Review.last.id + 1
+ get review_path(bogus_review_id)
+ must_respond_with :not_found
+ end
+ end
+
+ describe "reviews#edit" do
+
+ it "successfully loads edit review page" do
+ get edit_review_path(Review.first)
+ must_respond_with :success
+ end
+
+ it "renders 404 not_found for a bogus review_id" do
+ bogus_review_id = Review.last.id + 1
+ get edit_review_path(bogus_review_id)
+ must_respond_with :not_found
+ end
+
+ end
+
+ describe "reviews#update" do
+
+ describe "when authenticated" do
+
+ it "prevents merchants from updating a review of their own product" do
+ login(merchant)
+
+ review_to_update = merchant_product_review
+
+ review_data = {
+ review: {
+ product_id: merchant_product.id,
+ rating: 5
+ }
+ }
+
+ start_count = Review.count
+
+ patch review_path(review_to_update), params: review_data
+
+ Review.count.must_equal start_count
+
+ flash[:result_text].must_equal "Edit Permissions Denied: As a merchant, you cannot review your own products."
+
+ must_redirect_to review_path(review_to_update)
+
+ end
+
+ it "allows authorized (logged in) users to update their own review" do
+
+ login(merchant)
+
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 1
+ }
+ }
+
+ start_count = Review.count
+
+ post product_reviews_path(review_data[:review][:product_id]), params: review_data
+
+ Review.count.must_equal start_count + 1
+
+ flash[:result_text].must_equal "Successfully created your review!"
+
+ must_redirect_to review_path(Review.last.id)
+
+
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5
+ }
+ }
+
+ patch review_path(Review.last.id), params: review_data
+
+ flash[:result_text].must_equal "Successfully updated your review."
+ must_redirect_to review_path(Review.last.id)
+
+ end
+
+
+ it "if Authorized (logged in) user tries to update own review but provide invalid inputs, appropriate errors will display " do
+ login(merchant)
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5,
+ user_id: merchant.id
+ }
+ }
+
+ post product_reviews_path(product.id), params: review_data
+
+ m_review = Review.last
+ start_count = Review.count
+
+ review_data2 = {
+ review: {
+ rating: nil
+ }
+ }
+
+ patch review_path(m_review), params: review_data2
+
+ flash[:result_text].must_equal "Error: Could not successfully update your review."
+
+ # must_redirect_to review_path(m_review)
+
+ end
+
+ it "does not allow a logged in user to edit another user's review" do
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5,
+ user_id: another_user.id
+ }
+ }
+
+ post product_reviews_path(product.id), params: review_data
+ m_review = Review.last
+
+ login(merchant)
+
+ review_data2 = {
+ review: {
+ product_id: product.id,
+ rating: 2
+ }
+ }
+
+ patch review_path(m_review), params: review_data2
+
+ flash[:result_text].must_equal "Access Denied: You may not edit another user's review."
+
+ end
+ end
+
+ describe "when not authenticated" do
+
+ it "does not allow non-logged in users to update a review" do
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: ""
+ }
+ }
+
+ patch review_path(review), params: review_data
+
+ # flash[:result_text].must_equal "Access Denied: To edit, please log in as a user to edit your own review."
+
+ flash[:result_text].must_equal "Access Denied: To edit, you must have logged in to edit your own review."
+
+ must_redirect_to review_path(review)
+
+ # Verify the DB was not modified
+ Review.find(review.id).rating.must_equal review.rating
+ end
+ end
+
+
+ it "renders 404 not_found for a bogus review_id" do
+ bogus_review_id = Review.last.id + 1
+ get review_path(bogus_review_id)
+ must_respond_with :not_found
+ end
+
+ end
+
+ describe "reviews#destroy" do
+
+ it "does not allow non-authorized (not logged in) users to delete a review" do
+
+ # review_data = {
+ # review: {
+ # product_id: product.id,
+ # rating: 5,
+ # user_id: nil
+ # }
+ # }
+
+ delete review_path(review)
+
+ flash[:result_text].must_equal "Access Denied: To delete, please log in as a user to delete your own review."
+
+ must_redirect_to review_path(review)
+
+ # Verify the DB was not modified
+ Review.find(review.id).rating.must_equal review.rating
+
+ end
+
+ it "does not allow a merchant to delete others' review " do
+ login(merchant)
+ get root_path
+
+ start_count = Review.count
+ delete review_path(review)
+
+ flash[:result_text].must_equal "Access Denied: You may not delete another user's review."
+ must_redirect_to root_path
+ Review.count.must_equal start_count
+
+
+ end
+
+ it "allows a merchant to delete a review they wrote" do
+ # let(:review) {reviews(:one)}
+
+ login(merchant)
+ # get root_path
+ review_data = {
+ review: {
+ product_id: product.id,
+ rating: 5,
+ user_id: merchant.id
+ }
+ }
+
+ post product_reviews_path(product.id), params: review_data
+ start_count = Review.count
+
+ delete review_path(Review.last.id)
+ must_redirect_to root_path
+
+ flash[:result_text].must_equal "Successfully deleted your review!"
+
+ Review.count.must_equal start_count - 1
+ end
+
+ it "renders 404 not_found and does not update the DB for a bogus review_id" do
+ start_count = Review.count
+
+ bogus_review_id = Review.last.id + 1
+ delete review_path(bogus_review_id)
+ must_respond_with :not_found
+
+ Review.count.must_equal start_count
+ 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..63377c442b
--- /dev/null
+++ b/test/controllers/sessions_controller_test.rb
@@ -0,0 +1,79 @@
+require "test_helper"
+
+describe SessionsController do
+
+ describe "auth_callback" do
+ it "logs in an existing user and redirects to the root route" do
+ # Count the users, to make sure we're not (for example) creating
+ # a new user every time we get a login request
+ start_count = User.count
+
+ login(users(:amy))
+ must_redirect_to root_path
+
+ # Since we can read the session, check that the user ID was set as expected
+ session[:user_id].must_equal users(:amy).id
+
+ # Should *not* have created a new user
+ User.count.must_equal start_count
+ end
+
+ it "should not create a new user on repeated logins" do
+
+ proc{
+ 3.times do
+ login(users(:amy))
+ end
+ }.wont_change "User.count"
+
+ end
+
+ it "logged in user has a name" do
+ amy = users(:amy)
+ login(amy)
+ amy.name.must_equal "Amy Lee"
+
+ end
+
+ it "logged in user has an email address" do
+ amy = users(:amy)
+ login(amy)
+ amy.email.must_equal "amy@ada.com"
+ end
+
+ it "creates an account for a new user and redirects to the root route" do
+
+ start_count = User.count
+ user = User.new(provider: "github", uid: 99999, name: "test_user", email: "test@user.com")
+
+ login(user)
+ must_redirect_to root_path
+
+ # Should have created a new user
+ User.count.must_equal start_count + 1
+
+ # The new user's ID should be set in the session
+ session[:user_id].must_equal User.last.id
+ end
+
+ it "responds with bad request if given invalid user data" do
+
+ start_count = User.count
+ user = User.new(uid: 99999, name: "test_user", email: "test@user.com")
+
+ login(user)
+ must_respond_with :bad_request
+ User.count.must_equal start_count
+
+ end
+
+ it "successfully logs out a user" do
+ login(users(:amy))
+ post logout_path
+ must_redirect_to root_path
+ flash[:result_text].must_equal "Successfully logged out"
+ session[:user_id].must_be_nil
+ end
+
+ end
+end
diff --git a/test/controllers/static_pages_controller_test.rb b/test/controllers/static_pages_controller_test.rb
new file mode 100644
index 0000000000..9f239a95f6
--- /dev/null
+++ b/test/controllers/static_pages_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+describe StaticPagesController do
+
+ it "should get home page" do
+ get root_path
+ must_respond_with :success
+ end
+
+end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 0000000000..5bcdce1da6
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,44 @@
+require "test_helper"
+
+describe UsersController do
+
+ let(:user) {users(:amy)}
+
+ it "Users#Account" do
+ login(user)
+ get user_account_path(user.id)
+ must_respond_with :success
+ end
+
+ describe "OrderFulfillment Page" do
+ let (:buttercup) {users(:buttercup)}
+
+ it "shows a user's order fulfillment page " do
+ login(buttercup)
+
+ get user_orders_path(buttercup.id)
+
+ must_respond_with :success
+ end
+
+ it "renders 404 if user does not exist" do
+ nonexistant_id = (User.last.id) + 1
+
+ get user_orders_path(nonexistant_id)
+ must_respond_with :not_found
+
+ end
+
+ it "only allows a user to see their order fulfillment page if they are logged in" do
+
+ end
+
+ it "does not allow a user to see the order fulfillment page of a different user" do
+
+ end
+
+
+
+ end
+
+end
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
new file mode 100644
index 0000000000..afbb1d8ab6
--- /dev/null
+++ b/test/fixtures/categories.yml
@@ -0,0 +1,20 @@
+# 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
+#
+food:
+ name: food
+
+# column: value
+#
+clothing:
+ name: clothing
+
+cosmetics:
+ name: cosmetics
+
+transportation:
+ name: transportation
+# column: value
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml
new file mode 100644
index 0000000000..1bd6adbc58
--- /dev/null
+++ b/test/fixtures/order_items.yml
@@ -0,0 +1,21 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+orderitem1:
+ quantity: 1
+ product: chocolate
+ order: pending_order
+
+orderitem2:
+ quantity: 2
+ product: soap
+ order: paid_order
+
+orderitem3:
+ quantity: 1
+ product: scarves
+ order: paid_order
+
+orderitem4:
+ quantity: 2
+ product: candy2
+ order: paid_order
diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml
new file mode 100644
index 0000000000..a3aa3a1af6
--- /dev/null
+++ b/test/fixtures/orders.yml
@@ -0,0 +1,21 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+pending_order:
+ status: incomplete
+ customer_name: amy
+ email: amy@ada.com
+ mailing_address: "12345 Main Street, Anytown, USA"
+ cc_number: "1234123412341234"
+ cc_expiration_date: 2020-10-17
+ cc_cvv: 123
+ zipcode: MyString
+
+paid_order:
+ status: paid
+ customer_name: Jan E
+ email: je@ada.com
+ mailing_address: "12345 Main Street, Anytown, USA"
+ cc_number: "9999000099990000"
+ cc_expiration_date: 2030-10-17
+ cc_cvv: 123
+ zipcode: MyString
diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml
new file mode 100644
index 0000000000..1d20af304f
--- /dev/null
+++ b/test/fixtures/products.yml
@@ -0,0 +1,70 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+soap:
+ name: Fancy Soap
+ category: cosmetics
+ description: The most expensive soap ever
+ price: 9.99
+ quantity: 5
+ user: tanja
+ stock: "In Stock"
+
+
+chocolate:
+ name: Fancy Chocolate
+ category: food
+ description: Chocolate with gold inside
+ price: 9.99
+ quantity: 10
+ user: tanja
+ stock: "In Stock"
+
+yacht:
+ name: Weekend Yacht
+ description: for your luxurious weekend getaways
+ price: 9999.99
+ quantity: 1
+ user: bubbles
+ stock: "In Stock"
+
+tears:
+ name: Devil's Tears
+ category: cosmetics
+ description: Perfect skin, for the price of your soul.
+ price: 666.00
+ quantity: 3
+ user: buttercup
+ stock: "In Stock"
+
+nail_polish:
+ name: Snake poison nail polish
+ category: cosmetics
+ description: Polish made from deadliest snake outshines all the rest
+ price: 150.70
+ quantity: 9
+ user: buttercup
+ stock: "In Stock"
+
+scarves:
+ name: Merino Wool Scarf
+ description: Bundle Up with soft merino wool scarves
+ price: 50.00
+ quantity: 20
+ user: bubbles
+ stock: "In Stock"
+
+candy1:
+ name: RainbowLand Candy
+ description: Colorful candy
+ price: 50.00
+ quantity: 0
+ stock: In Stock
+ user: je
+
+candy2:
+ name: Cloud Candy
+ description: Airy Delicious Cotton Cloud Candy
+ price: 50.00
+ quantity: 10
+ stock: Out of Stock
+ user: je
diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml
new file mode 100644
index 0000000000..7b8ba7e8a0
--- /dev/null
+++ b/test/fixtures/reviews.yml
@@ -0,0 +1,21 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ rating: 5
+ text_review: MyText
+ product: soap
+
+two:
+ rating: 1
+ text_review: MyText
+ product: soap
+
+guest_review:
+ rating: 5
+ text_review: MyText
+ product: shoes
+
+candy2_review:
+ rating: 5
+ text_review: MyText
+ product: candy2
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 0000000000..19503da628
--- /dev/null
+++ b/test/fixtures/users.yml
@@ -0,0 +1,31 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+amy:
+ name: Amy Lee
+ email: amy@ada.com
+ provider: github
+ uid: 1
+
+tanja:
+ name: Tanja Stroble
+ email: tanja@ada.com
+ provider: github
+ uid: 2
+
+bubbles:
+ name: Bubbles
+ email: bubbles@powerpuff.com
+ uid: 9
+ provider: github
+
+buttercup:
+ name: buttercup
+ email: buttercup@powerpuff.com
+ uid: 10
+ provider: github
+
+je:
+ name: Jan E
+ email: je@ada.com
+ uid: 11
+ provider: github
diff --git a/test/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/integration/.keep b/test/integration/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/mailers/.keep b/test/mailers/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
new file mode 100644
index 0000000000..cfe026f267
--- /dev/null
+++ b/test/models/category_test.rb
@@ -0,0 +1,54 @@
+require "test_helper"
+
+describe Category do
+ let(:food_category) { categories(:food) }
+
+ describe "relations" do
+
+ it "has products" do
+ food_category.must_respond_to :products
+ end
+
+ it "can have many products" do
+ food_category.products << products(:chocolate)
+ food_category.products.first.must_be_kind_of Product
+
+ food_category.products << products(:tears)
+ food_category.products.count.must_equal 2
+ food_category.products.each do |product|
+ product.must_be_kind_of Product
+ end
+
+ food_category.products.first.name.must_equal products(:chocolate).name
+
+ end
+
+ it "can have zero products" do
+ new_category = Category.new(name: "services")
+ new_category.save
+
+ new_category.must_respond_to :products
+ new_category.products.count.must_equal 0
+
+ end
+ end
+
+ describe "validations" do
+ let(:new_category) { Category.new }
+
+ it "requires a name to be valid" do
+ new_category.valid?.must_equal false
+ end
+
+ it "is valid if it has a name" do
+ new_category.name = "service"
+ new_category.valid?.must_equal true
+ end
+
+ it "requires a unique name to be valid" do
+ new_category.name = categories(:food).name
+ new_category.valid?.must_equal false
+ end
+
+ end
+end
diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb
new file mode 100644
index 0000000000..a24de92623
--- /dev/null
+++ b/test/models/order_item_test.rb
@@ -0,0 +1,53 @@
+require "test_helper"
+
+describe OrderItem do
+ let(:item1) {order_items(:orderitem1)}
+ let(:order1) {orders(:pending_order)}
+ let(:product) { products(:soap)}
+
+ describe 'relationships' do
+ it "has a product" do
+ item1.must_respond_to :product
+ item1.must_be_kind_of OrderItem
+ item1.product.must_be_kind_of Product
+ end
+
+ it "has an order" do
+ item1.must_respond_to :order
+ item1.order.must_equal order1
+ end
+
+ end
+
+ describe 'validations' do
+ it "requires a quantity" do
+ item_no_quantity = OrderItem.new
+ item_no_quantity.valid?.must_equal false
+ item_no_quantity.errors.messages.must_include :quantity
+ end
+
+ it "requires that quantity is a positive integer " do
+ item1.quantity.must_be_kind_of Integer
+ item1.quantity.must_be :>, 0
+ item1.quantity.must_equal 1
+ end
+
+ it "accepts valid quantity" do
+ valid_quantity = [1, 20, 30, 4, 5]
+ valid_quantity.each do |quantity|
+ valid_orderitem = OrderItem.new(product_id: product.id, order_id: order1.id, quantity: quantity)
+ valid_orderitem.valid?.must_equal true
+ end
+ end
+
+ it "rejects invalid quantity" do
+ invalid_quantity = [-1, 0, 'one', nil]
+ invalid_quantity.each do |quantity|
+ invalid_orderitem = OrderItem.new(product_id: product.id, order_id: order1.id, quantity: quantity)
+ invalid_orderitem.valid?.must_equal false
+ invalid_orderitem.errors.messages.must_include :quantity
+ end
+ end
+ end
+
+end
diff --git a/test/models/order_test.rb b/test/models/order_test.rb
new file mode 100644
index 0000000000..03370d1233
--- /dev/null
+++ b/test/models/order_test.rb
@@ -0,0 +1,107 @@
+require "test_helper"
+
+describe Order do
+ let(:item1) {order_items(:orderitem1)}
+ let(:item2) {order_items(:orderitem2)}
+ let(:order1) {orders(:pending_order)}
+ let(:order2) {orders(:paid_order)}
+ let(:product) { products(:soap)}
+
+ let(:user) { users(:je)}
+
+
+ describe "relations" do
+ it "has many order_items" do
+ order1.must_respond_to :order_items
+ order1.must_be_kind_of Order
+ order1.order_items.each do |item|
+ item.must_be_kind_of OrderItem
+ end
+ end
+ end
+
+ describe "validations" do
+
+ it "an order requires a status" do
+ order_no_status = Order.new
+ order_no_status.status = ""
+ order_no_status.valid?.must_equal false
+ order_no_status.errors.messages.must_include :status
+ end
+
+ it "requires that the status is either incomplete or paid" do
+ order1.status.must_be_kind_of String
+ order1.status.must_equal "incomplete"
+ end
+
+ it "accepts valid status" do
+ valid_status = ["paid", "incomplete", "complete"]
+ valid_status.each do |status|
+ valid_order = Order.new(user_id: order1.user_id, status: status)
+ valid_order.valid?.must_equal true
+ end
+ end
+
+ it "rejects invalid status" do
+ invalid_status = [1, nil, "no status", 0.5]
+ invalid_status.each do |status|
+ invalid_order = Order.new(user_id: order1.user_id, status: status)
+ invalid_order.valid?.must_equal false
+ invalid_order.errors.messages.must_include :status
+ end
+ end
+ end
+
+ describe "Order#total_cost" do
+
+ it "order's total cost defaults to 0" do
+ new_order = Order.create!(user_id: user.id, status: "incomplete")
+ new_order.must_respond_to :total_cost
+ new_order.total_cost.must_equal 0
+ end
+
+
+ it "accurately calculates total cost" do
+ order1.total_cost.must_equal (order1.order_items.first.product.price * order1.order_items.first.quantity)
+
+ test_total = 0
+ order2.order_items.each do |order|
+ test_total += (order.product.price * order.quantity)
+ end
+ order2.total_cost.must_equal test_total
+ end
+ end
+
+ describe "custom model methods" do
+ let(:bubbles) {users(:bubbles)}
+ let(:user) {users(:tanja)}
+ describe "self.by_user(user)" do
+ it "returns a collection of orders that belong to the user" do
+ Order.by_user(bubbles).must_be_kind_of Enumerable
+
+ Order.by_user(bubbles).first.must_be_kind_of Order
+
+ Order.by_user(bubbles).count.must_equal 1
+
+ end
+
+ it "returns an array of orders" do
+ orders = Order.by_user(user).select { |order| order.status == "paid"}
+ orders.must_be_kind_of Array
+ end
+
+ it "order(s) returned must be paid" do
+ orders = Order.by_user(user).select { |order| order.status == "paid"}
+ orders.each do |order|
+ order.status.must_equal "paid"
+ end
+ end
+
+ it "returns the right number of orders" do
+ orders = Order.by_user(user).select { |order| order.status == "paid"}
+ orders.count.must_equal 1
+ end
+
+ end
+ end
+end
diff --git a/test/models/product_test.rb b/test/models/product_test.rb
new file mode 100644
index 0000000000..28d8b3519f
--- /dev/null
+++ b/test/models/product_test.rb
@@ -0,0 +1,200 @@
+require "test_helper"
+
+describe Product do
+
+ let(:product) { products(:soap)}
+
+ describe "relations" do
+ it "has a user" do
+ product.must_respond_to :user
+ product.must_be_kind_of Product
+ product.user.must_be_kind_of User
+ end
+
+ it "has a category" do
+ prod = products(:tears)
+ prod.must_respond_to :categories
+ end
+
+ it "has a list (can have many) reviews" do
+ product.must_respond_to :reviews
+ product.reviews.each do |review|
+ review.must_be_kind_of Review
+ end
+ end
+
+ it "has a list (can have many) order items" do
+ product.must_respond_to :order_items
+ product.order_items.each do |item|
+ item.must_be_kind_of OrderItem
+ end
+ end
+ end
+
+ describe "validations" do
+ let(:tanja) { users(:tanja) }
+
+ it "allows valid categories" do
+
+ end
+
+ it "rejects not created categories" do
+
+ end
+
+ it "requires a price greater than 0" do
+ product.price.must_be_kind_of BigDecimal
+ product.price.must_be :>, 0
+ end
+
+ it "accepts valid price" do
+ valid_price = [1, 5.00, 200.99]
+ valid_price.each do |price|
+ valid_product = Product.new(category: 'food', name: 'good-food', price: price, quantity: 5, user: tanja)
+ valid_product.valid?.must_equal true
+ end
+ end
+
+ it "rejects invalid price" do
+ invalid_price = [-1.00, nil, "1 dollar"]
+ invalid_price.each do |price|
+ invalid_product = Product.new(category: 'food', name: 'cool-food', price: price, quantity: 5, user: tanja)
+ invalid_product.valid?.must_equal false
+ invalid_product.errors.messages.must_include :price
+ end
+ end
+
+ it "requires a name" do
+ product = Product.new(category: 'food', price: 10.00, quantity: 5, user: tanja)
+ product.valid?.must_equal false
+ product.errors.messages.must_include :name
+ end
+
+ it "requires unique names w/in categories" do
+ category = 'food'
+ name = 'test name'
+ product1 = Product.new(name: name, category: category, price: 10.00, quantity: 5, user: tanja)
+ product1.save!
+
+ product2 = Product.new(name: name, category: category, price: 10.00, quantity: 5, user: tanja)
+ product2.valid?.must_equal false
+ # product2.errors.messages.must_include :name
+ end
+
+ it "does not require a unique name if the category is different" do
+ name = 'test name'
+ product1 = Product.new(name: name, category: 'food', price: 10.00, quantity: 5, user: tanja)
+ product1.save!
+
+ product2 = Product.new(name: name, category: 'cosmetics', price: 10.00, quantity: 5, user: tanja)
+ product2.valid?.must_equal true
+ end
+ end
+
+ describe "custom model methods " do
+
+ describe "self.by_category(category)" do
+ let(:transportation) { categories(:transportation) }
+ let(:weekend_yacht) {products(:yacht)}
+ let(:cosmetics_cat) { categories(:cosmetics)}
+ it "returns a collection of Products of the appropriate category" do
+ weekend_yacht.categories << transportation
+ Product.by_category(transportation).count.must_equal 1
+ Product.by_category(transportation)[0].must_be_kind_of Product
+
+ ###REFACTOR tests below ####
+ cosmetics = Product.where(category: "cosmetics")
+
+ cosmetics.each do |cosmetic|
+ cosmetic.categories << cosmetics_cat
+ end
+
+ Product.by_category(cosmetics_cat).must_be_kind_of Enumerable
+
+ Product.by_category(cosmetics_cat).count.must_equal 3
+
+ end
+
+ it "will not error out if there are no products of that category" do
+
+ Product.by_category("bamboozles").count.must_equal 0
+ end
+
+ end
+
+ describe "self.by_merchant(merchant)" do
+ let(:user) {users(:bubbles)}
+ it "returns an array of products by the given merchant" do
+ Product.by_merchant(user).count.must_equal user.products.count
+
+ user.products.each do |product|
+ Product.by_merchant(user).must_include product
+ end
+
+ Product.by_merchant(users(:buttercup)).count.must_equal 2
+
+ end
+
+ it "will not error out if there are no products from that merchant" do
+ Product.by_category("bamboozled").count.must_equal 0
+ end
+
+ end
+
+ describe "self.to_merchant_hash method" do
+ it "returns a hash with user names as keys and product arrays as values" do
+ merchant_hash = Product.to_merchant_hash
+
+ merchant_hash.must_be_kind_of Hash
+ merchant_hash.keys.count.must_equal 4
+
+ end
+
+ end
+
+ describe "Product#avg_rating" do
+ let(:soap_review1) {reviews(:one)}
+ let(:soap_review2) {reviews(:two)}
+
+ let(:product_no_review) {products(:chocolate)}
+
+ it "returns correct average rating" do
+ product.avg_rating.must_equal 3
+ end
+
+ it "returns 0 rating for products with no review" do
+ product_no_review.avg_rating.must_equal 0
+ end
+
+ end
+
+ describe "self.to_category_hash method" do
+ it "returns a hash with categories as keys and product arrays as values" do
+ category_hash = Product.to_category_hash
+
+ category_hash.must_be_kind_of Hash
+ category_hash.keys.count.must_equal 4
+ end
+ end
+
+ describe "Product#instock" do
+
+ let(:product_quant0) { products(:candy1)}
+ let(:outstock_product) { products(:candy2)}
+
+ it "returns true if product quantity is greater than 0 and stock is: In Stock" do
+ product.instock.must_equal true
+ end
+
+ it "returns false if product is quantity is 0" do
+ product_quant0.instock.must_equal false
+ end
+
+ it "returns false if product is stock is: Out of Stock" do
+ outstock_product.instock.must_equal false
+ end
+ end
+
+ end
+
+end
diff --git a/test/models/review_test.rb b/test/models/review_test.rb
new file mode 100644
index 0000000000..8d994aaeda
--- /dev/null
+++ b/test/models/review_test.rb
@@ -0,0 +1,50 @@
+require "test_helper"
+
+describe Review do
+ let(:review) { reviews(:one) }
+ let(:product) { products(:soap)}
+
+ describe "relations" do
+
+
+ it "has a product" do
+ review.must_respond_to :product
+ review.must_be_kind_of Review
+ review.product.must_be_kind_of Product
+ end
+
+ end
+
+ describe "validations" do
+ it "requires a rating" do
+ review_no_rating = Review.new
+ review_no_rating.valid?.must_equal false
+ review_no_rating.errors.messages.must_include :rating
+ end
+
+ it "rates between 1 and 5" do
+ review.rating.must_be_kind_of Integer
+ review.rating.must_be :>, 0
+ review.rating.must_be :<, 6
+ review.rating.must_equal 5
+ end
+
+ it "accepts valid ratings" do
+ valid_ratings = [1, 2, 3, 4, 5]
+ valid_ratings.each do |rating|
+ valid_review = Review.new(product_id: product.id, rating: rating)
+ valid_review.valid?.must_equal true
+ end
+ end
+
+ it "rejects invalid ratings" do
+ invalid_ratings = ['one', nil, -1 , 0]
+ invalid_ratings.each do |rating|
+ bad_review = Review.new(product_id: product.id, rating: rating)
+ bad_review.valid?.must_equal false
+ bad_review.errors.messages.must_include :rating
+ end
+ end
+
+ end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 0000000000..97bbfd94c4
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,142 @@
+require "test_helper"
+
+describe User do
+
+ let(:existing_user) { users(:amy)}
+
+ describe "relations" do
+ it "has a list of reviews" do
+ existing_user.must_respond_to :reviews
+ existing_user.reviews.each do |review|
+ review.must_be_kind_of Review
+ end
+ end
+
+ it "has a list of products" do
+ existing_user.must_respond_to :products
+ existing_user.products.each do |product|
+ product.must_be_kind_of Product
+ end
+ end
+ end
+
+ describe "validations" do
+ it "requires a uid" do
+ user = User.new(email: "newuser@ada.com", provider: "github")
+ user.valid?.must_equal false
+ user.errors.messages.must_include :uid
+ end
+
+ it "creates new user with valid (unique) uid info" do
+ valid_user = User.new(uid: 11112222, email: 'newuser@ada.com', provider: "github")
+ valid_user.valid?.must_equal true
+ end
+
+ it "rejects new user with non-unique uid" do
+ valid_user = User.new(uid: existing_user.uid, email: "newuser2@ada.com", provider: "github")
+ valid_user.valid?.must_equal false
+ end
+
+ it "requires an email" do
+ user = User.new(uid: 11112222, provider: "github")
+ user.valid?.must_equal false
+ user.errors.messages.must_include :email
+ end
+
+ it "creates new user with valid (unique) email" do
+ valid_user = User.new(uid: 11112222, email: 'newuser@ada.com', provider: "github")
+ valid_user.valid?.must_equal true
+ end
+
+ it "rejects new user with non-unique email" do
+ valid_user = User.new(uid: 11112222, email: existing_user.email, provider: "github")
+ valid_user.valid?.must_equal false
+ end
+
+ it "requires a provider" do
+ user = User.new(uid:11112222, email: "newuser@ada.com")
+ user.valid?.must_equal false
+ user.errors.messages.must_include :provider
+ end
+
+ it "creates new user with valid provider (github) info" do
+ valid_provider = ['github']
+
+ valid_provider.each do |provider|
+ valid_user = User.new(uid: 11112222, email: 'newuser@ada.com', provider: provider)
+ valid_user.valid?.must_equal true
+ end
+ end
+
+ it "rejects new user with invalid provider info" do
+ invalid_provider = [nil, "", 'gmail', 12, -0.5, "githublogin"]
+
+ invalid_provider.each do |provider|
+ invalid_user = User.new(uid: 11112222, email: 'newuser@ada.com', provider: provider)
+ invalid_user.valid?.must_equal false
+ invalid_user.errors.messages.must_include :provider
+ end
+ end
+
+ end
+
+ describe "custom model methods" do
+ let(:user) {users(:tanja)}
+ let(:order_item) {order_items(:orderitem2)}
+ let(:pending_order_item) {order_items(:orderitem1)}
+ let(:status) {"paid"}
+ let(:buttercup) {users(:buttercup)}
+
+ describe "total_revenue_by_status" do
+
+ it "returns a float" do
+ user.total_revenue_by_status(status).must_be_kind_of BigDecimal
+ end
+
+ it "returns a correct value for paid order" do
+ user.total_revenue_by_status(status).must_equal order_item.product.price * order_item.quantity
+ end
+
+ it "doesn't crash if user has no order items" do
+ newuser = User.new(name: "Bob")
+ newuser.must_respond_to :total_revenue_by_status
+ end
+
+ it "calculates revenue for zero value" do
+ newuser = User.new(name: "Bob")
+ newuser.total_revenue_by_status(status).must_equal 0.0
+ end
+
+ it "returns correct value for incomplete order" do
+ user.total_revenue_by_status("incomplete").must_equal pending_order_item.product.price * pending_order_item.quantity
+ end
+
+ end
+
+ describe "total_revenue" do
+ it "returns the correct value" do
+ user.total_revenue.must_equal user.total_revenue_by_status("paid") + user.total_revenue_by_status("incomplete")
+ end
+ end
+
+ describe "user_orders" do
+ it "returns an array of order items" do
+ user.user_orders.must_be_kind_of Array
+ user.user_orders.each do |order|
+ order.must_be_kind_of Order
+ end
+ end
+
+ it "returns an empty array if user has no orders" do
+ buttercup.user_orders.must_be_kind_of Array
+ buttercup.user_orders.count.must_equal 0
+ end
+
+ it "returns the correct value" do
+ user.user_orders.count.must_equal 2
+ end
+
+ end
+ end
+
+end
diff --git a/test/system/.keep b/test/system/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000000..664a753300
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,53 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path("../../config/environment", __FILE__)
+
+require 'simplecov'
+SimpleCov.start 'rails'
+
+require "rails/test_help"
+require "minitest/rails"
+require "minitest/reporters" # for Colorized output
+
+# For colorful output!
+Minitest::Reporters.use!(
+Minitest::Reporters::SpecReporter.new,
+ENV,
+Minitest.backtrace_filter
+)
+
+
+# To add Capybara feature tests add `gem "minitest-rails-capybara"`
+# to the test group in the Gemfile and uncomment the following:
+# require "minitest/rails/capybara"
+
+# Uncomment for awesome colorful output
+# require "minitest/pride"
+
+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...
+ def setup
+ # Once you have enabled test mode, all requests
+ # to OmniAuth will be short circuited to use the mock authentication hash.
+ # A request to /auth/provider will redirect immediately to /auth/provider/callback.
+ OmniAuth.config.test_mode = true
+ end
+
+ def mock_auth_hash(user)
+ return {
+ provider: user.provider,
+ uid: user.uid,
+ info: {
+ email: user.email,
+ nickname: user.name
+ }
+ }
+ end
+
+ def login(user)
+ OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user))
+ get auth_callback_path(:github)
+ end
+
+end
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 0000000000..e69de29bb2