-
<%= link_to membership.organization_name_formatted, membership.organization %>
<% if can?(:edit, membership) %>
- <%= link_to 'Edit',
- edit_participant_membership_path(@participant, membership),
+ <%= link_to 'Edit',
+ edit_participant_membership_path(@participant, membership),
:class => 'btn btn-primary btn-xs' %>
<% end %>
<% if can?(:destrory, membership) %>
- <%= link_to 'Remove',
+ <%= link_to 'Remove',
participant_membership_path(@participant, membership),
:method => :delete,
:class => 'btn btn-danger btn-xs' %>
@@ -49,7 +51,7 @@
<% end %>
<% end %>
<% end %>
-
+
<% unless @participant.shifts.blank? %>
Shifts:
@@ -60,7 +62,29 @@
<% end %>
-
+
+ Certifications:
+
+
+
<% unless @participant.checkouts.current.blank? %>
Tools:
@@ -72,8 +96,8 @@
<% end %>
-
-
+
+
<%= link_to t('.back', :default => t("helpers.links.back")),
participants_path, :class => 'btn btn-default' %>
@@ -101,4 +125,3 @@
<% else %>
Checked out at:
<%= date_and_time @tool.checkouts.current.first.checked_out_at %>
<% end %>
+ <% if !@tool.tool_type.tool_type_certifications.empty? %>
+ Required Certifications:
+
+
+ <% end %>
<%= link_to t('.back', :default => t("helpers.links.back")),
diff --git a/app/views/waivers/new.html.erb b/app/views/waivers/new.html.erb
index fb47137a..43aa0d91 100644
--- a/app/views/waivers/new.html.erb
+++ b/app/views/waivers/new.html.erb
@@ -1,108 +1,105 @@
-
-
-<% if !current_user.participant.is_scc? or params[:participant_id]== nil %>
You tried to do something suspicious
+
+
+
+
+
+
-
- - - <%= faq.question %> - -
-
-
- <%= faq.answer %>
- <% if can?(:update, faq) or can?(:destroy, faq) %>
-
-
-<% else %>
- -
- <% if can?(:update, faq) %>
- <%= link_to t('.edit', :default => t("helpers.links.edit")),
+
+ <% end %>
+
+ <% @faqs.each do |faq| %>
+
- <% end %>
+
+
+ + + <%= faq.question %> + +
+
+
+ <% end %>
+ <%= faq.answer %>
+ <% if can?(:update, faq) or can?(:destroy, faq) %>
+
+
+ <% end %>
+ +
+ <% if can?(:update, faq) %>
+ <%= link_to t('.edit', :default => t("helpers.links.edit")),
edit_faq_path(faq), :class => "btn btn-xs btn-primary" %>
- <% end %>
+ <% end %>
- <% if can?(:destroy, faq) %>
- <%= link_to t('.destroy', :default => t("helpers.links.destroy")),
+ <% if can?(:destroy, faq) %>
+ <%= link_to t('.destroy', :default => t("helpers.links.destroy")),
faq_path(faq),
:method => :delete,
:data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
:class => "btn btn-xs btn-danger" %>
- <% end %>
-
- <% end %>
- Not Authorized!
-<% end %> diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 016bcc17..0965ab09 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -5,12 +5,14 @@-
+
- Wristband: +
- <%= @wristband %> +
- <%= model_class.human_attribute_name(:has_signed_waiver) %>: +
- <%= @participant.has_signed_waiver ? "Yes" : "No" %> <% if can?(:read_phone_number, @participant) %>
- <%= model_class.human_attribute_name(:phone_number) %>:
- <%= @participant.formatted_phone_number %> - <% end %> -
- <%= model_class.human_attribute_name(:has_signed_waiver) %>: -
- <%= @participant.has_signed_waiver ? "yes" : "no" %> + <% end %>
- <%= model_class.human_attribute_name(:department) %>:
- <%= @participant.department %>
- <%= model_class.human_attribute_name(:student_class) %>: @@ -23,12 +25,12 @@
-
+ <% @participant.certifications.each do |cert| %>
+
- + <%= cert.certification_type.name %> + <% if can?(:destroy, Certification) %> + <%= link_to "Delete", + participant_certification_path(@participant, cert), + :method => :delete, + :class => 'btn btn-danger btn-xs' %> + <% end %> + + <% end %> + <% if can?(:create, Certification) && @participant.certifications.size < CertificationType.all.size %> +
- <%= link_to "Add", + new_participant_certification_path(@participant), + :class => 'btn btn-primary btn-xs' %> + <% end %> +
Not Authorized!
<% end %> - diff --git a/app/views/tools/show.html.erb b/app/views/tools/show.html.erb index e44ebd66..b2218605 100644 --- a/app/views/tools/show.html.erb +++ b/app/views/tools/show.html.erb @@ -14,6 +14,16 @@-
+ <% @tool.tool_type.tool_type_certifications.each do |cert| %>
+
- <%= cert.certification_type.name %> + <% end %> +
-
+
Midway Safety Video
+Spring Carnival <%= Time.now.year %> Safety Video
You must watch the video prior to signing the waiver.
-<% if !current_user.participant.is_scc? or params[:participant_id]== nil %> -<% end %> diff --git a/bin/delayed_job b/bin/delayed_job new file mode 100755 index 00000000..edf19598 --- /dev/null +++ b/bin/delayed_job @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) +require 'delayed/command' +Delayed::Command.new(ARGV).daemonize diff --git a/config/application.rb b/config/application.rb index 85cabc84..11edc805 100644 --- a/config/application.rb +++ b/config/application.rb @@ -24,6 +24,11 @@ class Application < Rails::Application # Do not swallow errors in after_commit/after_rollback callbacks. config.active_record.raise_in_transactional_callbacks = true + config.autoload_paths += %W(#{config.root}/lib) + + # Enables delay_job gem to queue up tasks + config.active_job.queue_adapter = :delayed_job + WillPaginate::ViewHelpers.pagination_options[:inner_window] = 1 WillPaginate::ViewHelpers.pagination_options[:outer_window] = 0 end diff --git a/config/routes.rb b/config/routes.rb index aff9b4c1..94b7e2e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,6 +32,7 @@ resources :participants do resources :memberships, :except => [:index, :show] resource :waiver, :except => [:edit, :destroy, :show, :update] + resources :certifications, :only => [:new, :create, :destroy] post 'lookup', on: :collection end diff --git a/db/migrate/20170305040259_add_waiver_start_to_participant.rb b/db/migrate/20170305040259_add_waiver_start_to_participant.rb new file mode 100644 index 00000000..46f785d0 --- /dev/null +++ b/db/migrate/20170305040259_add_waiver_start_to_participant.rb @@ -0,0 +1,5 @@ +class AddWaiverStartToParticipant < ActiveRecord::Migration + def change + add_column :participants, :waiver_start, :datetime + end +end diff --git a/db/migrate/20170321154121_create_certification_types.rb b/db/migrate/20170321154121_create_certification_types.rb new file mode 100644 index 00000000..58a29b36 --- /dev/null +++ b/db/migrate/20170321154121_create_certification_types.rb @@ -0,0 +1,9 @@ +class CreateCertificationTypes < ActiveRecord::Migration + def change + create_table :certification_types do |t| + t.string :name + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20170321154153_create_certifications.rb b/db/migrate/20170321154153_create_certifications.rb new file mode 100644 index 00000000..1db62495 --- /dev/null +++ b/db/migrate/20170321154153_create_certifications.rb @@ -0,0 +1,12 @@ +class CreateCertifications < ActiveRecord::Migration + def change + create_table :certifications do |t| + t.datetime :created_at + t.datetime :updated_at + t.belongs_to :participant, index: true, foreign_key: true + t.belongs_to :certification_type, index: true, foreign_key: true + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20170322031706_create_tool_type_certifications.rb b/db/migrate/20170322031706_create_tool_type_certifications.rb new file mode 100644 index 00000000..ea595dfc --- /dev/null +++ b/db/migrate/20170322031706_create_tool_type_certifications.rb @@ -0,0 +1,12 @@ +class CreateToolTypeCertifications < ActiveRecord::Migration + def change + create_table :tool_type_certifications do |t| + t.datetime :created_at + t.datetime :updated_at + t.belongs_to :tool_type, index: true, foreign_key: true + t.belongs_to :certification_type, index: true, foreign_key: true + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20170323163001_change_store_item_price_datatype.rb b/db/migrate/20170323163001_change_store_item_price_datatype.rb new file mode 100644 index 00000000..9b767922 --- /dev/null +++ b/db/migrate/20170323163001_change_store_item_price_datatype.rb @@ -0,0 +1,6 @@ +class ChangeStoreItemPriceDatatype < ActiveRecord::Migration + def change + change_column :store_items, :price, :decimal, :precision => 8, :scale => 2 + change_column :store_purchases, :price_at_purchase, :decimal, :precision => 8, :scale => 2 + end +end diff --git a/db/migrate/20170326233627_create_delayed_jobs.rb b/db/migrate/20170326233627_create_delayed_jobs.rb new file mode 100644 index 00000000..27fdcf6c --- /dev/null +++ b/db/migrate/20170326233627_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, force: true do |table| + table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue + table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually. + table.text :handler, null: false # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.string :queue # The name of the queue this job is in + table.timestamps null: true + end + + add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority" + end + + def self.down + drop_table :delayed_jobs + end +end diff --git a/db/migrate/20170402012413_add_participant_id_to_events.rb b/db/migrate/20170402012413_add_participant_id_to_events.rb new file mode 100644 index 00000000..26261f14 --- /dev/null +++ b/db/migrate/20170402012413_add_participant_id_to_events.rb @@ -0,0 +1,5 @@ +class AddParticipantIdToEvents < ActiveRecord::Migration + def change + add_column :events, :participant_id, :integer + end +end diff --git a/db/migrate/20170410184313_add_is_building_to_organization_category.rb b/db/migrate/20170410184313_add_is_building_to_organization_category.rb new file mode 100644 index 00000000..4ae80946 --- /dev/null +++ b/db/migrate/20170410184313_add_is_building_to_organization_category.rb @@ -0,0 +1,5 @@ +class AddIsBuildingToOrganizationCategory < ActiveRecord::Migration + def change + add_column :organization_categories, :is_building, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index a1a77c55..2f129a6c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,27 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160404161512) do +ActiveRecord::Schema.define(version: 20170410184313) do + + create_table "certification_types", force: :cascade do |t| + t.string "name", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "certifications", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "participant_id", limit: 4 + t.integer "certification_type_id", limit: 4 + end + + add_index "certifications", ["certification_type_id"], name: "index_certifications_on_certification_type_id", using: :btree + add_index "certifications", ["participant_id"], name: "index_certifications_on_participant_id", using: :btree create_table "charge_types", force: :cascade do |t| t.string "name", limit: 255 - t.boolean "requires_booth_chair_approval", limit: 1 + t.boolean "requires_booth_chair_approval" t.decimal "default_amount", precision: 8, scale: 2 t.text "description", limit: 65535 t.datetime "created_at" @@ -32,7 +48,7 @@ t.datetime "created_at" t.datetime "updated_at" t.datetime "charged_at" - t.boolean "is_approved", limit: 1 + t.boolean "is_approved" t.integer "creating_participant_id", limit: 4 end @@ -50,6 +66,38 @@ add_index "checkouts", ["tool_id"], name: "index_checkouts_on_tool_id", using: :btree + create_table "delayed_jobs", force: :cascade do |t| + t.integer "priority", limit: 4, default: 0, null: false + t.integer "attempts", limit: 4, default: 0, null: false + t.text "handler", limit: 65535, null: false + t.text "last_error", limit: 65535 + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by", limit: 255 + t.string "queue", limit: 255 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree + + create_table "delayed_jobs", force: :cascade do |t| + t.integer "priority", limit: 4, default: 0, null: false + t.integer "attempts", limit: 4, default: 0, null: false + t.text "handler", limit: 65535, null: false + t.text "last_error", limit: 65535 + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by", limit: 255 + t.string "queue", limit: 255 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree + create_table "documents", force: :cascade do |t| t.integer "document_id", limit: 4 t.string "name", limit: 255 @@ -57,21 +105,21 @@ t.datetime "created_at" t.datetime "updated_at" t.integer "organization_id", limit: 4 - t.boolean "public", limit: 1 + t.boolean "public" end create_table "event_types", force: :cascade do |t| - t.boolean "display", limit: 1 - t.string "name", limit: 255 - t.integer "priority", limit: 4 + t.boolean "display" + t.string "name", limit: 255 end create_table "events", force: :cascade do |t| - t.boolean "is_done", limit: 1 - t.integer "event_type_id", limit: 4 + t.boolean "is_done" + t.integer "event_type_id", limit: 4 t.datetime "created_at" - t.text "description", limit: 65535 + t.text "description", limit: 65535 t.datetime "updated_at" + t.integer "participant_id", limit: 4 end create_table "faqs", force: :cascade do |t| @@ -115,7 +163,7 @@ t.integer "participant_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" - t.boolean "is_booth_chair", limit: 1 + t.boolean "is_booth_chair" t.string "title", limit: 255 t.integer "booth_chair_order", limit: 4 end @@ -134,14 +182,15 @@ add_index "organization_aliases", ["organization_id"], name: "index_organization_aliases_on_organization_id", using: :btree create_table "organization_categories", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name", limit: 255 t.datetime "created_at" t.datetime "updated_at" + t.boolean "is_building" end create_table "organization_status_types", force: :cascade do |t| t.string "name", limit: 255 - t.boolean "display", limit: 1 + t.boolean "display" end create_table "organization_statuses", force: :cascade do |t| @@ -187,9 +236,9 @@ t.string "andrewid", limit: 255 t.datetime "created_at" t.datetime "updated_at" - t.boolean "has_signed_waiver", limit: 1 + t.boolean "has_signed_waiver" t.string "phone_number", limit: 255 - t.boolean "has_signed_hardhat_waiver", limit: 1 + t.boolean "has_signed_hardhat_waiver" t.integer "user_id", limit: 4 t.string "cached_name", limit: 255 t.string "cached_surname", limit: 255 @@ -197,6 +246,7 @@ t.string "cached_department", limit: 255 t.string "cached_student_class", limit: 255 t.datetime "cache_updated" + t.datetime "waiver_start" t.integer "phone_carrier_id", limit: 4 end @@ -252,19 +302,19 @@ create_table "store_items", force: :cascade do |t| t.string "name", limit: 255 - t.decimal "price", precision: 10 + t.decimal "price", precision: 8, scale: 2 t.integer "quantity", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "store_purchases", force: :cascade do |t| t.integer "charge_id", limit: 4 t.integer "store_item_id", limit: 4 - t.decimal "price_at_purchase", precision: 10 + t.decimal "price_at_purchase", precision: 8, scale: 2 t.integer "quantity_purchased", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end add_index "store_purchases", ["charge_id"], name: "index_store_purchases_on_charge_id", using: :btree @@ -277,9 +327,19 @@ t.text "description", limit: 65535 t.datetime "created_at" t.datetime "updated_at" - t.boolean "is_completed", limit: 1 + t.boolean "is_completed" end + create_table "tool_type_certifications", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "tool_type_id", limit: 4 + t.integer "certification_type_id", limit: 4 + end + + add_index "tool_type_certifications", ["certification_type_id"], name: "index_tool_type_certifications_on_certification_type_id", using: :btree + add_index "tool_type_certifications", ["tool_type_id"], name: "index_tool_type_certifications_on_tool_type_id", using: :btree + create_table "tool_types", force: :cascade do |t| t.string "name", limit: 255 t.datetime "created_at" @@ -292,7 +352,7 @@ t.integer "participant_id", limit: 4 t.integer "organization_id", limit: 4 t.string "note", limit: 255 - t.boolean "active", limit: 1, default: true + t.boolean "active", default: true t.datetime "created_at" t.datetime "updated_at" end @@ -336,10 +396,8 @@ add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id", using: :btree - add_foreign_key "judgements", "judgement_categories" - add_foreign_key "judgements", "judges" - add_foreign_key "judgements", "organizations" - add_foreign_key "participants", "phone_carriers" - add_foreign_key "store_purchases", "charges" - add_foreign_key "store_purchases", "store_items" + add_foreign_key "certifications", "certification_types" + add_foreign_key "certifications", "participants" + add_foreign_key "tool_type_certifications", "certification_types" + add_foreign_key "tool_type_certifications", "tool_types" end diff --git a/db/seeds.rb b/db/seeds.rb index f9e6d14b..b0179c41 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -15,14 +15,14 @@ # Organization Categories ----------------------------------------------------- puts 'Organization Categories' -fraternity = OrganizationCategory.create({ name: 'Fraternity'}) -sorority = OrganizationCategory.create({ name: 'Sorority'}) -independent = OrganizationCategory.create({ name: 'Independent'}) -blitz = OrganizationCategory.create({ name: 'Blitz'}) -concessions = OrganizationCategory.create({ name: 'Concessions'}) -non_building = OrganizationCategory.create({ name: 'Non-Building' }) -scc = OrganizationCategory.create({ name: 'SCC'}) -staff = OrganizationCategory.create({ name: 'Staff' }) +fraternity = OrganizationCategory.create({ name: 'Fraternity', is_building: true }) +sorority = OrganizationCategory.create({ name: 'Sorority', is_building: true }) +independent = OrganizationCategory.create({ name: 'Independent', is_building: true}) +blitz = OrganizationCategory.create({ name: 'Blitz', is_building: true }) +concessions = OrganizationCategory.create({ name: 'Concessions', is_building: true }) +non_building = OrganizationCategory.create({ name: 'Non-Building', is_building: false }) +scc = OrganizationCategory.create({ name: 'SCC', is_building: false }) +staff = OrganizationCategory.create({ name: 'Staff', is_building: false }) # Organizations --------------------------------------------------------------- puts 'Organizations' @@ -255,6 +255,14 @@ Membership.create({ organization: tsa_org, participant: Participant.create({ andrewid: 'ppan'}), is_booth_chair: true }) Membership.create({ organization: tsa_org, participant: Participant.create({ andrewid: 'pchao '}), is_booth_chair: true }) +# Certification Types -------------------------------------------------------- +puts 'Certification Types' + +golf_cart_cert = CertificationType.new({ name: 'Golf Cart' }) +scissor_lift_cert = CertificationType.new({ name: 'Scissor Lift' }) +Certification.create({ participant: chair, certification_type: golf_cart_cert }) +Certification.create({ participant: chair, certification_type: scissor_lift_cert }) + # Organization Status Types -------------------------------------------------- puts 'Organization Status Types' @@ -716,6 +724,9 @@ generate_tools +ToolTypeCertification.create({ tool_type: ToolType.find_by_name("Golf Cart"), certification_type: golf_cart_cert }) +ToolTypeCertification.create({ tool_type: ToolType.find_by_name("Scissor Lift"), certification_type: scissor_lift_cert }) + # Store ------------------------------------------------------------------------- puts 'Store' diff --git a/db/tool_seed.rb b/db/tool_seed.rb index b380d908..c713d49d 100644 --- a/db/tool_seed.rb +++ b/db/tool_seed.rb @@ -2636,5 +2636,12 @@ def generate_tools { barcode: 9995, type: 'Socket Wrench Set' }, { barcode: 9996, type: 'Socket Wrench Set' }, { barcode: 9997, type: 'Square', description: '12\'' }, - { barcode: 9998, type: 'Square', description: '12\'' } + { barcode: 9998, type: 'Square', description: '12\'' }, + { barcode: 10001, type: 'Golf Cart', description: 'Four seater' }, + { barcode: 10002, type: 'Golf Cart', description: 'Four seater' }, + { barcode: 10003, type: 'Golf Cart', description: 'Four seater' }, + { barcode: 10004, type: 'Golf Cart', description: 'Two seater with bed' }, + { barcode: 10005, type: 'Golf Cart', description: 'Two seater with bed' }, + { barcode: 10011, type: 'Scissor Lift', description: '12\' scissor lift' }, + { barcode: 10012, type: 'Scissor Lift', description: '12\' scissor lift' } ] diff --git a/lib/messenger.rb b/lib/messenger.rb new file mode 100644 index 00000000..0c293334 --- /dev/null +++ b/lib/messenger.rb @@ -0,0 +1,31 @@ +USER_UNSUBSCRIBED_FROM_TWILIO_ERROR_CODE = 21610 + +module Messenger + + def send_sms(number, content) + sid = ENV["TWILIO_ACCT_SID"] + auth = ENV["TWILIO_AUTH"] + + @client = Twilio::REST::Client.new sid, auth + + from = "+14123854063" + + # The following try-rescue block is needed in case user unsubscribe + # if the user ubsubscribe and we attempt to message them + # the api will report an error + + begin + message = @client.account.messages.create( + :from => from, + :to => '+1'+number, + :body => content + ) + rescue Twilio::REST::RequestError => e + case e.code + when USER_UNSUBSCRIBED_FROM_TWILIO_ERROR_CODE + puts e.message + end + end + end + +end \ No newline at end of file diff --git a/public/cheating.html b/public/cheating.html new file mode 100644 index 00000000..2e2b3294 --- /dev/null +++ b/public/cheating.html @@ -0,0 +1,34 @@ + + + +
+
+ You tried to skip the safety video
+Please watch the entire safety video before completing the waiver!
+
+ 
+
+
+
diff --git a/public/images/spy.jpg b/public/images/spy.jpg
new file mode 100644
index 00000000..ddac8118
Binary files /dev/null and b/public/images/spy.jpg differ
diff --git a/test/factories.rb b/test/factories.rb
index ce241aed..bb376658 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -28,7 +28,7 @@
# checkout
factory :checkout do
- checked_out_at Time.now
+ checked_out_at Time.now - 1.hour
association :tool
association :organization
@@ -40,6 +40,16 @@
url "MyString"
end
+ #event
+ factory :event do
+ association :event_type
+ end
+
+ #event_type
+ factory :event_type do
+ name { generate(:random_string) }
+ end
+
# faq
factory :faq do
question "MyText"
@@ -73,6 +83,19 @@
name { generate(:random_string) }
end
+ # organization_status
+ factory :organization_status do
+ association :organization
+ association :organization_status_type
+ association :participant
+ end
+
+ # organization_status_type
+ factory :organization_status_type do
+ name { generate(:random_string) }
+ display false
+ end
+
# organization_timeline_entry
factory :organization_timeline_entry do
description { generate(:random_string) }
@@ -85,6 +108,7 @@
# participant
factory :participant, :aliases => [:completed_by, :issuing_participant, :receiving_participant] do
andrewid { generate(:random_string) }
+ waiver_start DateTime.now
end
# shift
@@ -127,6 +151,16 @@
association :tool_type
end
+ # tool waitlist
+ factory :tool_waitlist do
+ wait_start_time Time.now
+ tool_type_id 1
+
+ association :tool_type
+ association :organization
+ association :participant
+ end
+
# user
factory :user do
name "Default Factory User"
@@ -135,4 +169,16 @@
association :participant
end
+ #store_purchase
+ factory :store_purchase do
+
+ association :store_item
+ end
+
+ #store_item
+ factory :store_item do
+ name "Hammer"
+
+ end
+
end
diff --git a/test/integration/participant_test.rb b/test/integration/participant_test.rb
index 841bb698..4cab6619 100644
--- a/test/integration/participant_test.rb
+++ b/test/integration/participant_test.rb
@@ -4,7 +4,7 @@ class ParticipantTest < ActiveSupport::TestCase
context "With a refreshed ldap cache, " do
setup do
- @participant = FactoryGirl.create(:participant, :andrewid => "meribyte")
+ @participant = FactoryGirl.create(:participant, :andrewid => "erwilson")
end
teardown do
@@ -16,23 +16,23 @@ class ParticipantTest < ActiveSupport::TestCase
end
should "return name from directory" do
- assert_equal "Margaret Richards", @participant.name
+ assert_equal "Eleanor Wilson", @participant.name
end
should "return surname from directory" do
- assert_equal "Richards", @participant.surname
+ assert_equal "Wilson", @participant.surname
end
should "return email from directory" do
- assert_equal "mouse@cmu.edu", @participant.email
+ assert_equal "erwilson@andrew.cmu.edu", @participant.email
end
should "return department from directory" do
- assert_equal "Eberly Center, Teaching Excellence & Educational Innovation", @participant.department
+ assert_equal "Dietrich College Interdisciplinary", @participant.department
end
should "return student class from directory" do
- assert_equal "Masters", @participant.student_class
+ assert_equal "Junior", @participant.student_class
end
end
end
diff --git a/test/models/store_item_test.rb b/test/models/store_item_test.rb
deleted file mode 100644
index dd66a54b..00000000
--- a/test/models/store_item_test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# ## Schema Information
-#
-# Table name: `store_items`
-#
-# ### Columns
-#
-# Name | Type | Attributes
-# ----------------- | ------------------ | ---------------------------
-# **`created_at`** | `datetime` | `not null`
-# **`id`** | `integer` | `not null, primary key`
-# **`name`** | `string(255)` |
-# **`price`** | `decimal(10, )` |
-# **`quantity`** | `integer` |
-# **`updated_at`** | `datetime` | `not null`
-#
-
-require 'test_helper'
-
-class StoreItemTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e7d175b3..ba9ed8c3 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,6 +8,8 @@
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
+ActiveRecord::Migration.maintain_test_schema!
+
class ActiveSupport::TestCase
def deny(condition)
diff --git a/test/unit/charge_test.rb b/test/unit/charge_test.rb
index db76547a..390302fd 100644
--- a/test/unit/charge_test.rb
+++ b/test/unit/charge_test.rb
@@ -32,23 +32,41 @@ class ChargeTest < ActiveSupport::TestCase
should belong_to(:organization)
should belong_to(:issuing_participant)
should belong_to(:receiving_participant)
+ should belong_to(:creating_participant)
should belong_to(:charge_type)
# Validations
+ should validate_presence_of(:charged_at)
+ should validate_presence_of(:issuing_participant)
+ should validate_presence_of(:organization)
+ should validate_presence_of(:charge_type)
+ should validate_presence_of(:amount)
+
+ should validate_numericality_of(:amount)
# Methods
context "With a proper context, " do
setup do
# Create a charges
- @fine = FactoryGirl.create(:charge)
+ @fine = FactoryGirl.create(:charge, :is_approved => false)
+ @fine2 = FactoryGirl.create(:charge, :is_approved => false)
+ @fine3 = FactoryGirl.create(:charge, :is_approved => true)
end
teardown do
end
should "show that all factories are properly created" do
- assert_equal 1, Charge.all.size
+ assert_equal 3, Charge.all.size
+ end
+
+ should "show that pending scope works" do
+ assert_equal 2, Charge.pending.size
+ end
+
+ should "show that approved scope works" do
+ assert_equal 1, Charge.approved.size
end
context "Testing charges" do
diff --git a/test/unit/charge_type_test.rb b/test/unit/charge_type_test.rb
index f66e1a12..06329edb 100644
--- a/test/unit/charge_type_test.rb
+++ b/test/unit/charge_type_test.rb
@@ -23,9 +23,13 @@ class ChargeTypeTest < ActiveSupport::TestCase
# Validations
+ should validate_presence_of(:name)
+ should validate_uniqueness_of(:name)
+
context "With a proper context, " do
setup do
- FactoryGirl.create(:charge_type)
+ @charge = FactoryGirl.create(:charge_type)
+ @charge_type = FactoryGirl.create(:charge, :charge_type => @charge)
end
teardown do
@@ -35,8 +39,12 @@ class ChargeTypeTest < ActiveSupport::TestCase
assert_equal 1, ChargeType.all.size
end
- # Scopes
+ should "show dependency on charge" do
+ assert_equal 1, Charge.all.size
+ @charge_type.destroy
+ assert_equal 0, Charge.all.size
+ end
+
- # Methods
end
end
diff --git a/test/unit/checkout_test.rb b/test/unit/checkout_test.rb
index 24f97a6c..dec960f3 100644
--- a/test/unit/checkout_test.rb
+++ b/test/unit/checkout_test.rb
@@ -35,18 +35,33 @@ class CheckoutTest < ActiveSupport::TestCase
context "With a proper context, " do
setup do
- FactoryGirl.create(:checkout)
+ @org = FactoryGirl.create(:organization, name: "bruce")
+ @person = FactoryGirl.create(:participant)
+ @type1 = FactoryGirl.create(:tool_type, name: "hammer")
+ @type2 = FactoryGirl.create(:tool_type, name: "drill")
+ @type3 = FactoryGirl.create(:tool_type, name: "lmao")
+ @t1 = FactoryGirl.create(:tool, barcode: 1111, tool_type: @type1)
+ @t2 = FactoryGirl.create(:tool, barcode: 2222, tool_type: @type2)
+ @t3 = FactoryGirl.create(:tool, barcode: 3333, tool_type: @type3)
+ @checkout1 = FactoryGirl.create(:checkout, :checked_in_at => Time.now, organization: @org, participant: @person, tool: @t1)
+ @checkout2 = FactoryGirl.create(:checkout, :checked_in_at => Time.now, organization: @org, participant: @person, tool: @t2)
+ @checkout3 = FactoryGirl.create(:checkout, :checked_in_at => nil, organization: @org, participant: @person, tool: @t3)
end
teardown do
end
should "show that all factories are properly created" do
- assert_equal 1, Checkout.all.size
+ assert_equal 3, Checkout.all.size
end
# Scopes
+ should "show that current scope works" do
+ assert_equal 1, Checkout.current.size
+ end
- # Methods
+ should "show that old scope works" do
+ assert_equal 2, Checkout.old.size
+ end
end
end
diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb
index 069b43d4..45bec4eb 100644
--- a/test/unit/document_test.rb
+++ b/test/unit/document_test.rb
@@ -20,11 +20,30 @@
class DocumentTest < ActiveSupport::TestCase
# Relationships
+ should belong_to(:organization)
- # Validations
+ context "With a proper context, " do
+ setup do
+ @org = FactoryGirl.create(:organization_alias, :id => 123)
+ @document = FactoryGirl.create(:document, :organization_id => @org.id, :name => "Booth")
+ @document2 = FactoryGirl.create(:document, :organization_id => @org.id, :name => "Electric")
+ end
- # Scopes
+ teardown do
+ end
- # Methods
+ # Validations- is there a better way to test this?
+ should "show that a document has an organization assocaited with it" do
+ assert_equal 123, @document.organization_id
+ end
+
+ #scopes
+ should "show that search scope works" do
+ @doc = Document.search('booth')
+ assert_equal 'Booth', @doc[0].name
+
+ end
+
+ end
end
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
new file mode 100644
index 00000000..efec1250
--- /dev/null
+++ b/test/unit/event_test.rb
@@ -0,0 +1,40 @@
+# ## Schema Information
+#
+# Table name: `events`
+#
+# ### Columns
+#
+# Name | Type | Attributes
+# --------------------- | ------------------ | ---------------------------
+# **`created_at`** | `datetime` |
+# **`description`** | `text(65535)` |
+# **`event_type_id`** | `integer` |
+# **`id`** | `integer` | `not null, primary key`
+# **`is_done`** | `boolean` |
+# **`participant_id`** | `integer` |
+# **`updated_at`** | `datetime` |
+#
+
+class EventTest < ActiveSupport::TestCase
+ # Relationships
+ should belong_to(:event_type)
+
+ # Scopes
+ context "With a proper context, " do
+ setup do
+ @type1 = FactoryGirl.create(:event_type, :display => false)
+ @type2 = FactoryGirl.create(:event_type, :display => true)
+ @event1 = FactoryGirl.create(:event, :is_done => true, :event_type_id => @type1.id)
+ @event2 = FactoryGirl.create(:event, :is_done => false, :event_type_id => @type2.id)
+ end
+
+ teardown do
+ end
+
+ #scopes
+ should "show that displayable scope works" do
+ assert_equal 1, Event.displayable.size
+ end
+ end
+
+end
diff --git a/test/unit/event_type_test.rb b/test/unit/event_type_test.rb
new file mode 100644
index 00000000..2d2877ab
--- /dev/null
+++ b/test/unit/event_type_test.rb
@@ -0,0 +1,20 @@
+# ## Schema Information
+#
+# Table name: `event_types`
+#
+# ### Columns
+#
+# Name | Type | Attributes
+# --------------- | ------------------ | ---------------------------
+# **`display`** | `boolean` |
+# **`id`** | `integer` | `not null, primary key`
+# **`name`** | `string(255)` |
+# **`priority`** | `integer` |
+#
+
+class EventTypeTest < ActiveSupport::TestCase
+ # Relationships
+ should have_many(:events)
+
+
+end
diff --git a/test/unit/faq_test.rb b/test/unit/faq_test.rb
index 806633fb..5c7e9854 100644
--- a/test/unit/faq_test.rb
+++ b/test/unit/faq_test.rb
@@ -16,12 +16,22 @@
require 'test_helper'
class FaqTest < ActiveSupport::TestCase
- # Relationships
- # Validations
+ context "With a proper context, " do
+ setup do
+ @faq1 = FactoryGirl.create(:faq, :question => "how to sign a waiver?")
+ @faq2 = FactoryGirl.create(:faq, :question => "how to build a booth?")
+ end
- # Scopes
+ teardown do
+ end
- # Methods
+ # Scope
+ should "show that a search scope works" do
+ @ans = Faq.search("sign a waiver?")
+ assert_equal "how to sign a waiver?", @ans[0].question
+ end
+
+ end
end
diff --git a/test/models/judge_test.rb b/test/unit/judge_test.rb
similarity index 100%
rename from test/models/judge_test.rb
rename to test/unit/judge_test.rb
diff --git a/test/models/judgement_category_test.rb b/test/unit/judgement_category_test.rb
similarity index 100%
rename from test/models/judgement_category_test.rb
rename to test/unit/judgement_category_test.rb
diff --git a/test/models/judgement_test.rb b/test/unit/judgement_test.rb
similarity index 91%
rename from test/models/judgement_test.rb
rename to test/unit/judgement_test.rb
index 204c7690..e62ac5d9 100644
--- a/test/models/judgement_test.rb
+++ b/test/unit/judgement_test.rb
@@ -27,7 +27,7 @@
require 'test_helper'
class JudgementTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
+ # Relationships
+ should belong_to(:judgement_category)
+ should belong_to(:judge)
+end
\ No newline at end of file
diff --git a/test/unit/membership_test.rb b/test/unit/membership_test.rb
index 4ab77ae8..dc10977c 100644
--- a/test/unit/membership_test.rb
+++ b/test/unit/membership_test.rb
@@ -34,28 +34,32 @@ class MembershipTest < ActiveSupport::TestCase
should validate_presence_of(:participant)
should validate_presence_of(:organization)
- context "With a proper context, " do
+ context 'With a proper context, ' do
setup do
- FactoryGirl.create(:membership)
- @chair = FactoryGirl.create(:membership, :is_booth_chair => true)
+ @org1 = FactoryGirl.create(:organization)
+ @org2 = FactoryGirl.create(:organization)
+ @nonchair = FactoryGirl.create(:membership, organization: @org1)
+ @chair = FactoryGirl.create(:membership, organization: @org2, :is_booth_chair => true)
end
teardown do
+ @nonchair = nil
+ @chair = nil
end
- should "show that all factories are properly created" do
+ should 'show that all factories are properly created' do
assert_equal 2, Membership.all.size
end
# Scopes
+ should 'booth_chair scope should return all booth chairs' do
+ assert_equal 1, Membership.booth_chairs.size
+ end
# Methods
- context "Testing memberships" do
- should "know booth chairs" do
- #puts Membership.booth_chairs.map{ |bc| bc.participant.andrewid }
- assert_equal 1, Membership.booth_chairs.size
- assert_equal @chair, Membership.booth_chairs.first
- end
+ should 'formatted_name should return the organization followed and indication if this member is booth chair' do
+ assert_equal "#{@org1.name}", @nonchair.organization_name_formatted
+ assert_equal "#{@org2.name} - Booth Chair", @chair.organization_name_formatted
end
end
end
diff --git a/test/unit/organization_alias_test.rb b/test/unit/organization_alias_test.rb
index 3448024a..3e5ac9a2 100644
--- a/test/unit/organization_alias_test.rb
+++ b/test/unit/organization_alias_test.rb
@@ -27,22 +27,47 @@ class OrganizationAliasTest < ActiveSupport::TestCase
should belong_to(:organization)
# Validations
+ should validate_presence_of(:name)
+ should validate_presence_of(:organization)
+ should validate_uniqueness_of(:name)
- context "With a proper context, " do
+ context 'With a proper context, ' do
setup do
- FactoryGirl.create(:organization_alias)
+ @alias1 = FactoryGirl.create(:organization_alias, name: 'winner')
+ @alias2 = FactoryGirl.create(:organization_alias, name: 'loser')
+ @org1 = FactoryGirl.create(:organization)
+ @org2 = FactoryGirl.create(:organization)
+ @alias1.organization = @org1
+ @alias2.organization = @org2
end
teardown do
+ @alias1 = nil
+ @alias2 = nil
+ @org1 = nil
+ @org2 = nil
end
- should "show that all factories are properly created" do
- assert_equal 1, OrganizationAlias.all.size
+ should 'show that all factories are properly created' do
+ assert_equal 2, OrganizationAlias.all.size
end
# Scopes
+ # Search scope
+ should 'the search by term function should work correctly' do
+ assert_equal 1, OrganizationAlias.search("winner").size
+ assert_equal 1, OrganizationAlias.search("loser").size
+ assert_equal 0, Organization.search("blah").size
+ end
+
# Methods
+ should 'formatted name should return the organization name followed by the alias in parathesis' do
+ answer1 = "#{@org1.name} (winner)"
+ answer2 = "#{@org2.name} (loser)"
+ assert_equal answer1, @alias1.formatted_name
+ assert_equal answer2, @alias2.formatted_name
+ end
end
end
diff --git a/test/unit/organization_category_test.rb b/test/unit/organization_category_test.rb
index 9e5fdc1b..55549921 100644
--- a/test/unit/organization_category_test.rb
+++ b/test/unit/organization_category_test.rb
@@ -19,22 +19,32 @@ class OrganizationCategoryTest < ActiveSupport::TestCase
should have_many(:organizations)
# Validations
+ should validate_presence_of(:name)
+ should validate_uniqueness_of(:name)
- context "With a proper context, " do
+ context 'With a proper context, ' do
setup do
- FactoryGirl.create(:organization_category)
+ @cat1 = FactoryGirl.create(:organization_category)
+ @cat2 = FactoryGirl.create(:organization_category)
end
teardown do
+ @cat1 = nil
+ @cat2 = nil
end
- should "show that all factories are properly created" do
- assert_equal 1, OrganizationCategory.all.size
+ should 'show that all factories are properly created' do
+ assert_equal 2, OrganizationCategory.all.size
end
- # Scopes
-
- # Methods
-
+ # dependency
+ should 'remove all associated organizations once this organization category is removed' do
+ @org1 = FactoryGirl.create(:organization, organization_category: @cat1)
+ @org2 = FactoryGirl.create(:organization, organization_category: @cat1)
+ @org3 = FactoryGirl.create(:organization, organization_category: @cat2)
+ assert_equal 3, Organization.all.size
+ @cat1.destroy
+ assert_equal 1, Organization.all.size
+ end
end
end
diff --git a/test/unit/organization_status_test.rb b/test/unit/organization_status_test.rb
new file mode 100644
index 00000000..04ef62b4
--- /dev/null
+++ b/test/unit/organization_status_test.rb
@@ -0,0 +1,70 @@
+# ## Schema Information
+#
+# Table name: `organization_statuses`
+#
+# ### Columns
+#
+# Name | Type | Attributes
+# ---------------------------------- | ------------------ | ---------------------------
+# **`created_at`** | `datetime` |
+# **`description`** | `string(255)` |
+# **`id`** | `integer` | `not null, primary key`
+# **`organization_id`** | `integer` |
+# **`organization_status_type_id`** | `integer` |
+# **`participant_id`** | `integer` |
+# **`updated_at`** | `datetime` |
+#
+# ### Indexes
+#
+# * `index_organization_statuses_on_organization_id`:
+# * **`organization_id`**
+#
+
+require 'test_helper'
+
+class OrganizationStatusTest < ActiveSupport::TestCase
+
+ # Relationships
+ should belong_to(:organization_status_type)
+ should belong_to(:organization)
+ should belong_to(:participant)
+
+ # Validations
+ should validate_presence_of(:organization_status_type)
+ should validate_presence_of(:organization)
+ should validate_presence_of(:participant)
+
+ context 'With a proper context,' do
+ setup do
+ @status_type1 = FactoryGirl.create(:organization_status_type)
+ @status_type2 = FactoryGirl.create(:organization_status_type, :display => true)
+ @org = FactoryGirl.create(:organization)
+ @p = FactoryGirl.create(:participant)
+ @status1 = FactoryGirl.create(:organization_status,
+ :organization_status_type => @status_type1,
+ :organization => @org, :participant => @p)
+ @status2 = FactoryGirl.create(:organization_status,
+ :organization_status_type => @status_type2,
+ :organization => @org, :participant => @p)
+ end
+
+ teardown do
+ @status_type1 = nil
+ @status_type2 = nil
+ @org = nil
+ @p = nil
+ @status1 = nil
+ @status2 = nil
+ end
+
+ should 'show that all factories are properly created' do
+ assert_equal 2, OrganizationStatus.all.size
+ end
+
+ # Scope
+ should 'display statuses that are only displayable' do
+ assert_equal 1, OrganizationStatus.displayable.size
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/unit/organization_status_type_test.rb b/test/unit/organization_status_type_test.rb
new file mode 100644
index 00000000..da8df923
--- /dev/null
+++ b/test/unit/organization_status_type_test.rb
@@ -0,0 +1,58 @@
+# ## Schema Information
+#
+# Table name: `organization_status_types`
+#
+# ### Columns
+#
+# Name | Type | Attributes
+# -------------- | ------------------ | ---------------------------
+# **`display`** | `boolean` |
+# **`id`** | `integer` | `not null, primary key`
+# **`name`** | `string(255)` |
+## ## Schema Information
+#
+
+
+require 'test_helper'
+
+class OrganizationStatusTypeTest < ActiveSupport::TestCase
+
+ # Relationships
+ should have_many(:organization_statuses)
+
+ # Validations
+ should validate_presence_of(:name)
+ should validate_uniqueness_of(:name)
+
+ context 'With a proper context, ' do
+ setup do
+ @type1 = FactoryGirl.create(:organization_status_type)
+ @person = FactoryGirl.create(:participant)
+ @org = FactoryGirl.create(:organization)
+ @status = FactoryGirl.create(:organization_status,
+ participant: @person, organization: @org, organization_status_type: @type1)
+ end
+
+ teardown do
+ @type1 = nil
+ @person = nil
+ @org = nil
+ @status = nil
+ end
+ #
+ should 'show that all factories are properly created' do
+ assert_equal 1, OrganizationStatusType.all.size
+ end
+
+ # Dependency
+ should 'delete status if status type is destroyed' do
+ @type1.update_attribute(:display, true)
+ assert(@status.valid?)
+ assert_equal 1, OrganizationStatus.all.size
+
+ @type1.destroy
+ assert_equal 0, OrganizationStatus.all.size
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
index 68f870c9..5969993d 100644
--- a/test/unit/organization_test.rb
+++ b/test/unit/organization_test.rb
@@ -21,6 +21,7 @@
require 'test_helper'
+
class OrganizationTest < ActiveSupport::TestCase
# Relationships
should belong_to(:organization_category)
@@ -42,7 +43,7 @@ class OrganizationTest < ActiveSupport::TestCase
context "With a proper context, " do
setup do
- @short_org = FactoryGirl.create(:organization, :name => 'longer name', :short_name => 'name')
+ @short_org = FactoryGirl.create(:organization, :name => 'short name', :short_name => 'name')
@long_org = FactoryGirl.create(:organization, :name => 'long name', :short_name => nil)
end
@@ -54,11 +55,127 @@ class OrganizationTest < ActiveSupport::TestCase
end
# Scopes
+ # only_categories
+ should "show that the only_categories functions correctly" do
+ short_org_category = @short_org.organization_category.name
+ long_org_category = @long_org.organization_category.name
+ assert_equal ['short name'], Organization.only_categories(short_org_category).map {|org| org.name}
+ assert_equal ['long name'], Organization.only_categories(long_org_category).map {|org| org.name}
+ end
+
+ # search
+ should "show that the search scope functions correcly" do
+ assert_equal ['long name'], Organization.search('long name').map {|org| org.name }
+ assert_equal ['long name', 'short name'], Organization.search('name').map {|org| org.name}
+ end
+
+ # ---------------------------- End of scope testing
# Methods
should 'have a short_name method' do
assert_equal('name', @short_org.short_name)
assert_equal('long name', @long_org.short_name)
end
+
+ should 'give back the correct booth chair for this organization' do
+ chair_person = FactoryGirl.create(:participant)
+ short_chair = FactoryGirl.create(:membership,
+ is_booth_chair: true,
+ organization: @short_org,
+ participant: chair_person)
+ assert_equal [chair_person.andrewid], @short_org.booth_chairs.map { |bc| bc.andrewid }
+ assert_equal [], @long_org.booth_chairs
+ end
+
+ should 'give back the correct hour of current downtime' do
+ t = Time.now
+ entry = FactoryGirl.create(:organization_timeline_entry, entry_type: 2,
+ started_at: t - 2.hours, ended_at: t, organization: @short_org)
+
+ assert_equal 2.hours, @short_org.downtime
+ end
+
+ should 'give back the correct hour of remaining downtime' do
+ t = Time.now
+ entry = FactoryGirl.create(:organization_timeline_entry, entry_type: 2,
+ started_at: t - 3.hours, ended_at: t, organization: @short_org)
+
+ assert_equal 1.hours, @short_org.remaining_downtime
+ end
+
+ # --------------------------- End of Methods testing
+
+ # Dependencies
+ should 'delete all associated organization_aliases once the organization is removed' do
+ alias1 = FactoryGirl.create(:organization_alias, organization: @short_org)
+ alias2 = FactoryGirl.create(:organization_alias, organization: @short_org)
+ alias3 = FactoryGirl.create(:organization_alias, organization: @long_org)
+ assert_equal 3, OrganizationAlias.all.size
+
+ @short_org.destroy
+ assert_equal 1, OrganizationAlias.all.size
+ end
+
+ should 'delete all associated organization_statuses once the organization is removed' do
+ person1 = FactoryGirl.create(:participant)
+ person2 = FactoryGirl.create(:participant)
+ status_type = FactoryGirl.create(:organization_status_type)
+ status1 = FactoryGirl.create(:organization_status, organization: @short_org,
+ participant: person1, organization_status_type: status_type)
+ status2 = FactoryGirl.create(:organization_status, organization: @long_org,
+ participant: person2, organization_status_type: status_type)
+
+ assert_equal 2, OrganizationStatus.all.size
+
+ @short_org.destroy
+ assert_equal 1, OrganizationStatus.all.size
+ end
+
+ should 'delete all associated organization_timeline_entries once the organization is removed' do
+ entry1 = FactoryGirl.create(:organization_timeline_entry, organization: @short_org)
+ entry2 = FactoryGirl.create(:organization_timeline_entry, organization: @short_org)
+ entry3 = FactoryGirl.create(:organization_timeline_entry, organization: @long_org)
+
+ assert_equal 3, OrganizationTimelineEntry.all.size
+ @short_org.destroy
+ assert_equal 1, OrganizationTimelineEntry.all.size
+ end
+
+ should 'delete all associated charges once the organization is removed' do
+ issuer = FactoryGirl.create(:participant)
+ type = FactoryGirl.create(:charge_type)
+
+ charge1 = FactoryGirl.create(:charge,
+ organization: @short_org, issuing_participant: issuer, charge_type: type)
+ charge2 = FactoryGirl.create(:charge,
+ organization: @short_org, issuing_participant: issuer,
+ charge_type: type, is_approved: true)
+ charge3 = FactoryGirl.create(:charge,
+ organization: @long_org, issuing_participant: issuer, charge_type: type)
+
+ assert_equal 3, Charge.all.size
+
+ @short_org.destroy
+
+ assert_equal 1, Charge.all.size
+ end
+
+ should 'delete all associated documents once the organization is removed' do
+ doc1 = FactoryGirl.create(:document, organization: @short_org)
+ doc2 = FactoryGirl.create(:document, organization: @short_org)
+ doc3 = FactoryGirl.create(:document, organization: @long_org)
+ assert_equal 3, Document.all.size
+ @short_org.destroy
+ assert_equal 1, Document.all.size
+ end
+
+ should 'delete all checkouts once the organization is removed' do
+ type = FactoryGirl.create(:tool_type)
+ tool = FactoryGirl.create(:tool, tool_type: type)
+ checkout = FactoryGirl.create(:checkout, tool: tool, organization: @short_org)
+ assert_equal 1, Checkout.all.size
+ @short_org.destroy
+ assert_equal 0, Checkout.all.size
+ end
end
end
diff --git a/test/unit/organization_timeline_entry_test.rb b/test/unit/organization_timeline_entry_test.rb
index ecf4007b..a9bc0bfa 100644
--- a/test/unit/organization_timeline_entry_test.rb
+++ b/test/unit/organization_timeline_entry_test.rb
@@ -32,23 +32,28 @@ class OrganizationTimelineEntryTest < ActiveSupport::TestCase
should validate_presence_of(:entry_type)
should validate_presence_of(:organization)
- context "With a proper context, " do
+ context 'With a proper context, ' do
setup do
time = Time.now
- @finished = FactoryGirl.create(:organization_timeline_entry, :started_at => time - 1.hour, :ended_at => time)
- @not_finished = FactoryGirl.create(:organization_timeline_entry, :started_at => DateTime.now - 12.hours, :ended_at => nil)
+ @finished = FactoryGirl.create(:organization_timeline_entry,
+ :started_at => time - 1.hour, :ended_at => time)
+ @not_finished = FactoryGirl.create(:organization_timeline_entry,
+ :started_at => DateTime.now - 12.hours, :ended_at => nil)
end
teardown do
+ @finished = nil
+ @not_finished = nil
end
- should "show that all factories are properly created" do
+ should 'show that all factories are properly created' do
assert_equal 2, OrganizationTimelineEntry.all.size
end
- # Scopes
+ should 'the current scope should return the ongoing entry' do
+ assert_equal 1, OrganizationTimelineEntry.current.size
+ end
- # Methods
should 'show that the duration method works' do
assert_equal 1.hour, @finished.duration
assert_equal 12.hour, (@not_finished.duration / 1.hour).round * 1.hour
diff --git a/test/unit/participant_test.rb b/test/unit/participant_test.rb
index c0c950ca..2fa66161 100644
--- a/test/unit/participant_test.rb
+++ b/test/unit/participant_test.rb
@@ -21,6 +21,7 @@
# **`phone_number`** | `string(255)` |
# **`updated_at`** | `datetime` |
# **`user_id`** | `integer` |
+# **`waiver_start`** | `datetime` |
#
# ### Indexes
#
@@ -45,8 +46,16 @@ class ParticipantTest < ActiveSupport::TestCase
context "With a proper context, " do
setup do
- @participant = FactoryGirl.create(:participant, :phone_number => 1234567890)
+ @participant = FactoryGirl.create(:participant, :phone_number => 1234567890, :andrewid => "agoradia", :cached_name => "Akshay Goradia", :waiver_start => DateTime.now - 10.minutes)
+ @organization_category = FactoryGirl.create(:organization_category)
+ @organization = FactoryGirl.create(:organization, :name => "Spring Carnival Committee", :organization_category => @organization_category)
@temp_participant = FactoryGirl.create(:participant)
+ @membership = FactoryGirl.create(:membership, :is_booth_chair => true, :participant => @participant, :organization => @organization)
+ @checkout = FactoryGirl.create(:checkout, :participant => @participant)
+ @shift_participant = FactoryGirl.create(:shift_participant, :participant => @participant)
+ @organization_status = FactoryGirl.create(:organization_status, :participant => @participant)
+ @user = FactoryGirl.create(:user, :participant => @participant)
+
end
teardown do
@@ -57,12 +66,94 @@ class ParticipantTest < ActiveSupport::TestCase
end
context "Testing participants" do
+
+
+ should "show that dependency on checkout works" do
+ assert_equal 1, Checkout.all.size
+ @participant.destroy
+ assert_equal 0, Checkout.all.size
+ end
+
+ should "show that dependency on membership works" do
+ assert_equal 1, Membership.all.size
+ @participant.destroy
+ assert_equal 0, Membership.all.size
+ end
+
+ should "show that dependency on shift_participant works" do
+ assert_equal 1, ShiftParticipant.all.size
+ @participant.destroy
+ assert_equal 0, ShiftParticipant.all.size
+ end
+
+ should "show that dependency on organization_status works" do
+ assert_equal 1, OrganizationStatus.all.size
+ @participant.destroy
+ assert_equal 0, OrganizationStatus.all.size
+ end
+
+ should "show that dependency on user works" do
+ assert_equal 1, User.all.size
+ @participant.destroy
+ assert_equal 0, User.all.size
+ end
+
+ should "show that search scope works properly" do
+ assert_equal [@participant], Participant.search("agoradia")
+ assert_equal [], Participant.search("rkelly")
+ end
+
+ should "show that scc scope works properly" do
+ assert_equal [@participant], Participant.scc
+ end
+
should "correctly format a participant's phone number" do
assert_equal "(123) 456-7890", @participant.formatted_phone_number
-
assert_equal "N/A", @temp_participant.formatted_phone_number
end
+
+ should "correctly determine if participant skipped video" do
+ assert_equal false, @participant.is_waiver_cheater?
+
+ assert_equal true, @temp_participant.is_waiver_cheater?
+ end
+
+ should "show that is_booth_chair method works correctly" do
+ assert_equal true, @participant.is_booth_chair?
+ end
+
+ should "show that is_scc method works correctly" do
+ assert_equal true, @participant.is_scc?
+ end
+
+ should "show that name method works correctly" do
+ assert_equal "Akshay Goradia", @participant.name
+ end
+
+ should "show that surname method works correctly" do
+ assert_equal "Goradia", @participant.surname
+ end
+
+ should "show that email method works correctly" do
+ assert_equal "agoradia@cmu.edu", @participant.email
+ end
+
+ should "show that department method works correctly" do
+ assert_equal "Dietrich College Interdisciplinary, Human-Computer Interaction", @participant.department
+ end
+
+ should "show that student_class method works correctly" do
+ assert_equal "Junior", @participant.student_class
+ end
+
+ should "show that formatted_phone_number method works correctly" do
+ assert_equal "(123) 456-7890", @participant.formatted_phone_number
+ end
+
+ should "show that formatted_name method works correctly" do
+ assert_equal "Akshay Goradia (agoradia)", @participant.formatted_name
+ end
+
end
-
end
end
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index ef52f5bd..dd1b5e6c 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -28,6 +28,8 @@
class RoleTest < ActiveSupport::TestCase
# Relationships
+ should have_and_belong_to_many(:users)
+
# Validations
# Scopes
diff --git a/test/unit/shift_participant_test.rb b/test/unit/shift_participant_test.rb
index a71c5730..20a9476e 100644
--- a/test/unit/shift_participant_test.rb
+++ b/test/unit/shift_participant_test.rb
@@ -35,19 +35,30 @@ class ShiftParticipantTest < ActiveSupport::TestCase
context "With a proper context, " do
setup do
- FactoryGirl.create(:shift_participant)
+ @shift = FactoryGirl.create(:shift, :ends_at => Time.zone.now + 2.hour, :starts_at => Time.zone.now)
+ @late= FactoryGirl.create(:shift_participant, :shift_id => @shift.id, :clocked_in_at => Time.zone.now + 1.hour)
+ @not_late= FactoryGirl.create(:shift_participant, :shift_id => @shift.id, :clocked_in_at => Time.zone.now)
end
teardown do
end
should "show that all factories are properly created" do
- assert_equal 1, ShiftParticipant.all.size
+ assert_equal 2, ShiftParticipant.all.size
end
# Scopes
+ should "show that scope 'checked in late' is working" do
+ assert_equal @late.id , ShiftParticipant.checked_in_late[0].id
+ end
# Methods
end
end
+
+
+
+
+
+
diff --git a/test/unit/shift_test.rb b/test/unit/shift_test.rb
index 3d903a2a..ac2e3803 100644
--- a/test/unit/shift_test.rb
+++ b/test/unit/shift_test.rb
@@ -35,16 +35,22 @@ class ShiftTest < ActiveSupport::TestCase
#does not need to have an organization
should validate_presence_of(:starts_at)
should validate_presence_of(:ends_at)
+ should validate_presence_of(:shift_type)
should validate_presence_of(:required_number_of_participants)
context "With a proper context, " do
setup do
# Create 3 shifts
- @upcomming = FactoryGirl.create(:shift, :ends_at => Time.local(2021,1,1,15,0,0), :starts_at => Time.now + 1.hour)
- @current = FactoryGirl.create(:shift, :ends_at => Time.local(2020,1,1,15,0,0), :starts_at => Time.local(2014,1,1,13,4,0))
- @past = FactoryGirl.create(:shift, :ends_at => Time.local(2001,1,1,15,0,0), :starts_at => Time.local(2000,1,1,14,10,0))
- @not_checked_in = FactoryGirl.create(:shift, :required_number_of_participants => 1 )
- @checked_in = FactoryGirl.create(:shift, :required_number_of_participants => 2)
+ @type1 = FactoryGirl.create(:shift_type, :id => 1)
+ @type2 = FactoryGirl.create(:shift_type, :id => 2)
+ @type3 = FactoryGirl.create(:shift_type, :id => 3)
+
+ @upcomming = FactoryGirl.create(:shift, :shift_type_id => @type1.id, :ends_at => Time.local(2021,1,1,16,0,0), :starts_at => Time.zone.now + 1.hour)
+ @future = FactoryGirl.create(:shift, :shift_type_id => @type2.id, :ends_at => Time.local(2021,1,1,16,0,0), :starts_at => Time.zone.now + 7.hour)
+ @current = FactoryGirl.create(:shift, :shift_type_id => @type3.id, :ends_at => Time.local(2020,1,1,16,0,0), :starts_at => Time.local(2016,1,1,13,4,0))
+ @past = FactoryGirl.create(:shift, :shift_type_id => @type1.id, :ends_at => Time.local(2001,1,1,16,0,0), :starts_at => Time.local(2000,1,1,14,10,0))
+ @not_checked_in = FactoryGirl.create(:shift, :shift_type_id => @type2.id, :required_number_of_participants => 1, :ends_at => Time.local(2001,1,1,16,0,0), :starts_at => Time.local(2000,1,1,14,10,0))
+ @checked_in = FactoryGirl.create(:shift, :shift_type_id => @type2.id, :required_number_of_participants => 2, :ends_at => Time.local(2001,1,1,16,0,0), :starts_at => Time.local(2000,1,1,14,10,0))
FactoryGirl.create(:shift_participant, :shift => @checked_in)
FactoryGirl.create(:shift_participant, :shift => @checked_in)
end
@@ -53,7 +59,7 @@ class ShiftTest < ActiveSupport::TestCase
end
should "show that all factories are properly created" do
- assert_equal 5, Shift.all.size
+ assert_equal 6, Shift.all.size
end
# Scopes
@@ -65,11 +71,42 @@ class ShiftTest < ActiveSupport::TestCase
assert_equal 1, Shift.upcoming.size
end
+ should "have a scope 'future' that works" do
+ assert_equal 2, Shift.future.size
+ end
+
+ should "have a scope 'past' that works" do
+ assert_equal 3, Shift.past.size
+ end
+
+ should "have a scope 'missed' that works" do
+ assert_equal 5, Shift.missed.size
+ end
+
+ should "have a scope 'watch_shifts' that works" do
+ assert_equal 2, Shift.watch_shifts.size
+ end
+
+ should "have a scope 'sec_shifts' that works" do
+ assert_equal 3, Shift.sec_shifts.size
+ end
+
+ should "have a scope 'coord_shifts' that works" do
+ assert_equal 1, Shift.coord_shifts.size
+ end
+
# Methods
should "have a method 'is_checked_in' that works" do
assert_equal true, @checked_in.is_checked_in
assert_equal false, @not_checked_in.is_checked_in
end
+
+ should "have a method 'formatted_name' that works" do
+ @type = FactoryGirl.create(:shift_type, :name => "Bob")
+ @ex = FactoryGirl.create(:shift, :shift_type_id => @type.id, :ends_at => Time.local(2001,1,1,16,0,0), :starts_at => Time.new(2000,1,1))
+ assert_equal 'Bob @ Jan 1 at 12:00 AM', @ex.formatted_name
+
+ end
end
end
diff --git a/test/unit/store_item_test.rb b/test/unit/store_item_test.rb
new file mode 100644
index 00000000..4de416bd
--- /dev/null
+++ b/test/unit/store_item_test.rb
@@ -0,0 +1,44 @@
+# ## Schema Information
+#
+# Table name: `store_items`
+#
+# ### Columns
+#
+# Name | Type | Attributes
+# ----------------- | ------------------ | ---------------------------
+# **`created_at`** | `datetime` | `not null`
+# **`id`** | `integer` | `not null, primary key`
+# **`name`** | `string(255)` |
+# **`price`** | `decimal(10, )` |
+# **`quantity`** | `integer` |
+# **`updated_at`** | `datetime` | `not null`
+#
+
+require 'test_helper'
+
+class StoreItemTest < ActiveSupport::TestCase
+
+ #relationships
+
+ should have_many(:store_purchases)
+
+ #methods
+
+ context "With a proper context, " do
+ setup do
+ # Create store
+ @store_item = FactoryGirl.create(:store_item, :name => "Hammer", :price => 20, :quantity => 5)
+ # Create charge
+ @charge = FactoryGirl.create(:charge, :is_approved => true)
+ # Create store_purchase
+ @store_purchase = FactoryGirl.create(:store_purchase, :price_at_purchase => 20, :quantity_purchased => 1, :store_item_id => @store_item.id)
+ end
+
+ teardown do
+ end
+
+ should "show that quantity_available method works correctly" do
+ assert_equal 4, @store_item.quantity_available
+ end
+ end
+end
diff --git a/test/models/store_purchase_test.rb b/test/unit/store_purchase_test.rb
similarity index 52%
rename from test/models/store_purchase_test.rb
rename to test/unit/store_purchase_test.rb
index b4141ae9..e994189e 100644
--- a/test/models/store_purchase_test.rb
+++ b/test/unit/store_purchase_test.rb
@@ -25,7 +25,31 @@
require 'test_helper'
class StorePurchaseTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
+
+ #relationships
+ should have_one(:organization).through(:charge)
+ should belong_to(:charge)
+ should belong_to(:store_item)
+
+ #methods
+
+ context "With a proper context, " do
+ setup do
+ # Create store
+ @store_item = FactoryGirl.create(:store_item, :name => "Hammer", :price => 20, :quantity => 3)
+ # Create store_purchase
+ @store_purchase = FactoryGirl.create(:store_purchase, :price_at_purchase => 20, :quantity_purchased => 1, :store_item_id => @store_item.id)
+ end
+
+ teardown do
+ end
+
+ should "show that items_in_cart works properly" do
+ assert_equal [@store_purchase], StorePurchase.items_in_cart
+ end
+
+ should "show that items_in_cart? works properly" do
+ assert_equal true, StorePurchase.items_in_cart?
+ end
+ end
end
diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb
index 8452c8df..7ea30d68 100644
--- a/test/unit/task_test.rb
+++ b/test/unit/task_test.rb
@@ -46,6 +46,13 @@ class TaskTest < ActiveSupport::TestCase
assert_equal 2, Task.upcoming.size
end
+ should "have a scope 'is_incomplete' that works" do
+ assert_equal 2, Task.is_incomplete.size
+ end
+
+ should "have a scope 'is_complete' that works" do
+ assert_equal 1, Task.is_complete.size
+ end
# Methods
should "show that the is_past_due method works" do
assert_equal true, @assign_rides.is_past_due
diff --git a/test/unit/tool_test.rb b/test/unit/tool_test.rb
index 9c0654a8..0d936f65 100644
--- a/test/unit/tool_test.rb
+++ b/test/unit/tool_test.rb
@@ -31,8 +31,8 @@ class ToolTest < ActiveSupport::TestCase
should belong_to(:tool_type)
# Validations
- # should validate_uniqueness_of(:barcode)
- # should validate_uniqueness_of(:name)
+ should validate_uniqueness_of(:barcode)
+ should validate_presence_of(:tool_type_id)
context "With a proper context, " do
setup do
@@ -44,7 +44,7 @@ class ToolTest < ActiveSupport::TestCase
@shannon_participant = FactoryGirl.create(:participant)
# Create 6 tools
- @hammer = FactoryGirl.create(:tool)
+ @hammer = FactoryGirl.create(:tool, :barcode => 12811)
@saw_type = FactoryGirl.create(:tool_type, name: 'Saw')
@saw = FactoryGirl.create(:tool, :barcode => 12390, :description => "SAW", tool_type: @saw_type)
@@ -57,7 +57,7 @@ class ToolTest < ActiveSupport::TestCase
@hard_hat_2 = FactoryGirl.create(:tool, :barcode => 12809, :description => "HARD HAT 2", tool_type: @hard_hat_type)
@radio_type = FactoryGirl.create(:tool_type, name: 'Radio')
- @radio = FactoryGirl.create(:tool, tool_type: @radio_type)
+ @radio = FactoryGirl.create(:tool, :barcode => 12810, tool_type: @radio_type, :description => "RADIO")
# Create 4 checkouts
@hammer_checkout1 = FactoryGirl.create(:checkout, :checked_in_at => DateTime.now + 3.days, :tool => @hammer, :organization => @sdc)
@@ -68,39 +68,66 @@ class ToolTest < ActiveSupport::TestCase
teardown do
end
+ #scopes
should "show that all factories are properly created" do
assert_equal 6, Tool.all.size
end
+ should "show that the by barcode scope works" do
+ assert_equal 12012, Tool.by_barcode[0].barcode
+ assert_equal 12811, Tool.by_barcode[5].barcode
+ end
+
+ should "show that the by type scope works" do
+ assert_equal [@hard_hat_1, @hard_hat_2], Tool.by_type(@hard_hat_type)
+ assert_equal [@radio], Tool.by_type(@radio_type)
+ assert_equal [@ladder], Tool.by_type(@ladder_type)
+ end
+
should "have a scope 'hardhats' that works" do
assert_equal 2, Tool.hardhats.size
end
-
should "have a scope 'radios' that works" do
assert_equal 1, Tool.radios.size
end
-
should "have a scope 'just_tools' that works" do
assert_equal 3, Tool.just_tools.size
end
- should "show that the 'current_participant' method works" do
- assert_equal nil, @hammer.current_participant
- assert_equal @shannon_participant, @saw.current_participant
- assert_equal nil, @hard_hat_1.current_participant
- assert_equal nil, @ladder.current_participant
+ should "have a scope 'search' that works" do
+ assert_equal @radio.barcode, Tool.search('radio')[0].barcode
+ end
+
+ should "have a scope 'checked_in' that works" do
+ @radio_checkin = FactoryGirl.create(:checkout, :tool => @radio, :checked_out_at => Time.now - 1.hour, :checked_in_at => Time.now + 1.hour)
+ @ladder_checkin = FactoryGirl.create(:checkout, :tool => @ladder, :checked_out_at => Time.now - 1.hour, :checked_in_at => Time.now + 1.hour)
+ @hardhat2_checkin = FactoryGirl.create(:checkout, :tool => @hard_hat_2, :checked_out_at => Time.now - 1.hour, :checked_in_at => Time.now + 1.hour)
+ assert_equal 3, Tool.checked_in.size
+ end
+
+ should "have a scope 'checked_out' that works" do
+ assert_equal 3, Tool.checked_out.size
end
- should "show that the 'current_organization' method works" do
+ #methods
+
+ should "show that the 'current_organization' method works" do
assert_equal @sdc, @hammer.current_organization
assert_equal @theta, @saw.current_organization
assert_equal @theta, @hard_hat_1.current_organization
assert_equal nil, @ladder.current_organization
end
-
+
+ should "show that the 'current_participant' method works" do
+ assert_equal nil, @hammer.current_participant
+ assert_equal @shannon_participant, @saw.current_participant
+ assert_equal nil, @hard_hat_1.current_participant
+ assert_equal nil, @ladder.current_participant
+ end
+
should "show that the is_checked_out? method works" do
assert @hammer.is_checked_out?
assert @saw.is_checked_out?
@@ -108,14 +135,29 @@ class ToolTest < ActiveSupport::TestCase
deny @ladder.is_checked_out?
end
+ should "show that is_waitlist_critical works" do
+ @wait1 = FactoryGirl.create(:tool_waitlist, :tool_type_id => @saw.id)
+ @wait2 = FactoryGirl.create(:tool_waitlist, :tool_type_id => @saw.id)
+ assert_equal true, @saw.is_waitlist_critical?
+ assert_equal false, @ladder.is_waitlist_critical?
+ end
+
+ should "show that is_hardhat works" do
+ assert @hard_hat_1.is_hardhat?
+ deny @radio.is_hardhat?
+ end
+
should "show that the 'self.checked_out_by_organization(organization)' method works" do
assert_equal [@saw, @hard_hat_1], Tool.checked_out_by_organization(@theta)
end
- should "show that the by type scope works" do
- assert_equal [@hard_hat_1, @hard_hat_2], Tool.by_type(@hard_hat_type)
- assert_equal [@radio], Tool.by_type(@radio_type)
- assert_equal [@ladder], Tool.by_type(@ladder_type)
+ should "show that name works" do
+ assert_equal 'Radio', @radio.name
+ end
+
+ should "show that that the method formatted name works" do
+ assert_equal '12810: Radio - RADIO', @radio.formatted_name
+ assert_equal '12012: Ladder - LADDER', @ladder.formatted_name
end
end
diff --git a/test/unit/tool_type_test.rb b/test/unit/tool_type_test.rb
index c7d7b156..f4762e3c 100644
--- a/test/unit/tool_type_test.rb
+++ b/test/unit/tool_type_test.rb
@@ -17,6 +17,7 @@
class ToolTypeTest < ActiveSupport::TestCase
should have_many(:tools)
+ should have_many(:tool_waitlists)
should validate_presence_of(:name)
should validate_uniqueness_of(:name)
diff --git a/test/unit/tool_waitlist_test.rb b/test/unit/tool_waitlist_test.rb
index 5911841e..e085215e 100644
--- a/test/unit/tool_waitlist_test.rb
+++ b/test/unit/tool_waitlist_test.rb
@@ -25,7 +25,62 @@
require 'test_helper'
class ToolWaitlistTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
+#Relationships
+ should belong_to(:tool_type)
+ should belong_to(:organization)
+ should belong_to(:participant)
+
+ #Validations
+ should validate_presence_of(:tool_type)
+ should validate_presence_of(:organization)
+ should validate_presence_of(:participant)
+ should validate_presence_of(:wait_start_time)
+
+ context "With a proper context, " do
+ setup do
+ # creating people for waitlist
+ # @person1 = FactoryGirl.create(:participant, :andrewid => 'ersmith')
+ @person2 = FactoryGirl.create(:participant, :andrewid => 'erbob')
+ @person3 = FactoryGirl.create(:participant, :andrewid => 'ersam')
+
+ #making tool types
+ @saw = FactoryGirl.create(:tool_type, name: 'Saw')
+ @hammer = FactoryGirl.create(:tool_type, name: 'Hammer')
+
+ # making waitlist
+ @wait1 = FactoryGirl.create(:tool_waitlist, :tool_type_id => @saw.id)
+ @wait2 = FactoryGirl.create(:tool_waitlist, :tool_type_id => @saw.id, :wait_start_time => (Time.now + 1.hour) )
+ @wait3 = FactoryGirl.create(:tool_waitlist, :tool_type_id => @hammer.id, :wait_start_time => (Time.now + 2.hour))
+ end
+
+ teardown do
+ end
+
+ should "show that all factories are properly created" do
+ assert_equal 3, ToolWaitlist.all.size
+ end
+ # Scopes
+
+ should "show that for_tool_type scope works" do
+ assert_equal 2, ToolWaitlist.for_tool_type(1).size
+ assert_equal 1, ToolWaitlist.for_tool_type(1)[0].tool_type_id
+ assert_equal 1, ToolWaitlist.for_tool_type(1)[1].tool_type_id
+ end
+
+ should "show that by_wait_start_time scope works" do
+ assert_equal @wait1.id, ToolWaitlist.by_wait_start_time[0].id
+ assert_equal @wait3.id, ToolWaitlist.by_wait_start_time[2].id
+ end
+
+ #Methods
+ should "show that duration method works" do
+ @wait = FactoryGirl.create(:tool_waitlist, :tool_type_id => @saw.id, :wait_start_time => (Time.now - 1.hour) )
+ assert_equal 60, @wait.duration_waiting.round
+ end
+
+
+
+
+ end
+
end
+