From 8a74e7d77f1363656407b5de1182e77ff906e948 Mon Sep 17 00:00:00 2001 From: benni Date: Fri, 27 Jul 2012 18:07:42 +0200 Subject: [PATCH] Removed annoate and hirb Gemfiles. Annotate: Better look in schema.rb, this reference should be always up to date. Hirb: To reactivate hirb, look in railscasts: http://railscasts.com/episodes/48-console-tricks-revised --- Gemfile | 5 ---- Gemfile.lock | 4 --- app/models/article_category.rb | 9 ------ app/models/article_price.rb | 13 --------- app/models/assignment.rb | 10 ------- app/models/delivery.rb | 11 ------- app/models/financial_transaction.rb | 12 -------- app/models/group.rb | 29 ------------------- app/models/group_order.rb | 13 --------- app/models/group_order_article.rb | 13 --------- app/models/group_order_article_quantity.rb | 11 ------- app/models/invite.rb | 12 -------- app/models/invoice.rb | 19 ------------ app/models/membership.rb | 9 ------ app/models/message.rb | 14 --------- app/models/order.rb | 15 ---------- app/models/order_article.rb | 14 --------- app/models/order_comment.rb | 11 ------- app/models/ordergroup.rb | 29 ------------------- app/models/page.rb | 16 ---------- app/models/shared_article.rb | 24 --------------- app/models/shared_supplier.rb | 23 --------------- app/models/stock_article.rb | 26 ----------------- app/models/stock_change.rb | 13 --------- app/models/stock_taking.rb | 10 ------- app/models/supplier.rb | 22 -------------- app/models/task.rb | 18 ------------ app/models/user.rb | 18 ------------ app/models/workgroup.rb | 29 ------------------- config/environments/development.rb.SAMPLE | 7 +---- test/fixtures/article_categories.yml | 9 ------ test/fixtures/article_prices.yml | 13 --------- test/fixtures/articles.yml | 23 --------------- test/fixtures/assignments.yml | 10 ------- test/fixtures/financial_transactions.yml | 12 -------- .../group_order_article_quantities.yml | 11 ------- test/fixtures/groups.yml | 29 ------------------- test/fixtures/memberships.yml | 9 ------ test/fixtures/messages.yml | 14 --------- test/fixtures/order_comments.yml | 11 ------- test/fixtures/orders.yml | 15 ---------- test/fixtures/pages.yml | 16 ---------- test/fixtures/stock_changes.yml | 13 --------- test/fixtures/stock_takings.yml | 10 ------- test/fixtures/suppliers.yml | 23 --------------- test/fixtures/tasks.yml | 18 ------------ test/fixtures/users.yml | 18 ------------ test/unit/article_category_test.rb | 9 ------ test/unit/article_price_test.rb | 13 --------- test/unit/article_test.rb | 26 ----------------- test/unit/assignment_test.rb | 10 ------- test/unit/financial_transaction_test.rb | 12 -------- .../unit/group_order_article_quantity_test.rb | 11 ------- test/unit/group_test.rb | 29 ------------------- test/unit/membership_test.rb | 9 ------ test/unit/order_comment_test.rb | 11 ------- test/unit/order_test.rb | 15 ---------- test/unit/page_test.rb | 16 ---------- test/unit/shared_article_test.rb | 24 --------------- test/unit/shared_supplier_test.rb | 23 --------------- test/unit/stock_article_test.rb | 26 ----------------- test/unit/stock_change_test.rb | 13 --------- test/unit/stock_taking_test.rb | 10 ------- test/unit/supplier_test.rb | 22 -------------- test/unit/task_test.rb | 18 ------------ test/unit/user_test.rb | 18 ------------ test/unit/workgroup_test.rb | 29 ------------------- 67 files changed, 1 insertion(+), 1056 deletions(-) diff --git a/Gemfile b/Gemfile index 7f7225f7..d53e4c24 100644 --- a/Gemfile +++ b/Gemfile @@ -20,11 +20,6 @@ gem 'localize_input', :git => "git://github.com/bennibu/localize_input.git" gem 'acts_as_configurable' gem 'wikicloth' -group :development do - gem 'annotate' - gem 'hirb' -end - group :production do gem 'exception_notification', :require => 'exception_notifier' end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index d3af0f01..bb46dc98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,7 +35,6 @@ GEM activesupport (= 3.0.12) activesupport (3.0.12) acts_as_configurable (0.0.8) - annotate (2.4.0) arel (2.0.10) builder (2.1.2) client_side_validations (3.0.4) @@ -47,7 +46,6 @@ GEM fastercsv (1.5.4) haml (3.1.4) has_scope (0.5.0) - hirb (0.3.4) i18n (0.5.0) inherited_resources (1.2.2) has_scope (~> 0.5.0) @@ -125,12 +123,10 @@ PLATFORMS DEPENDENCIES acts_as_configurable - annotate client_side_validations exception_notification fastercsv haml - hirb inherited_resources jquery-rails localize_input! diff --git a/app/models/article_category.rb b/app/models/article_category.rb index aa82e719..eceb23e9 100644 --- a/app/models/article_category.rb +++ b/app/models/article_category.rb @@ -5,12 +5,3 @@ class ArticleCategory < ActiveRecord::Base end -# == Schema Information -# -# Table name: article_categories -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# - diff --git a/app/models/article_price.rb b/app/models/article_price.rb index 316c3925..3a42104a 100644 --- a/app/models/article_price.rb +++ b/app/models/article_price.rb @@ -31,16 +31,3 @@ class ArticlePrice < ActiveRecord::Base end end -# == Schema Information -# -# Table name: article_prices -# -# id :integer(4) not null, primary key -# article_id :integer(4) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(8, 2) default(0.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :integer(4) -# created_at :datetime -# - diff --git a/app/models/assignment.rb b/app/models/assignment.rb index 6408b9e8..04127d7e 100644 --- a/app/models/assignment.rb +++ b/app/models/assignment.rb @@ -15,13 +15,3 @@ class Assignment < ActiveRecord::Base end -# == Schema Information -# -# Table name: assignments -# -# id :integer(4) not null, primary key -# user_id :integer(4) default(0), not null -# task_id :integer(4) default(0), not null -# accepted :boolean(1) default(FALSE) -# - diff --git a/app/models/delivery.rb b/app/models/delivery.rb index 62510326..3add6fdf 100644 --- a/app/models/delivery.rb +++ b/app/models/delivery.rb @@ -19,14 +19,3 @@ class Delivery < ActiveRecord::Base end -# == Schema Information -# -# Table name: deliveries -# -# id :integer(4) not null, primary key -# supplier_id :integer(4) -# delivered_on :date -# created_at :datetime -# note :text -# - diff --git a/app/models/financial_transaction.rb b/app/models/financial_transaction.rb index 540f03c5..354a3d2a 100644 --- a/app/models/financial_transaction.rb +++ b/app/models/financial_transaction.rb @@ -15,15 +15,3 @@ class FinancialTransaction < ActiveRecord::Base end end -# == Schema Information -# -# Table name: financial_transactions -# -# id :integer(4) not null, primary key -# ordergroup_id :integer(4) default(0), not null -# amount :decimal(8, 2) default(0.0), not null -# note :text default(""), not null -# user_id :integer(4) default(0), not null -# created_on :datetime not null -# - diff --git a/app/models/group.rb b/app/models/group.rb index a3e1b79c..c1976830 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -25,32 +25,3 @@ class Group < ActiveRecord::Base end -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# - diff --git a/app/models/group_order.rb b/app/models/group_order.rb index c5675ad9..4d89d803 100644 --- a/app/models/group_order.rb +++ b/app/models/group_order.rb @@ -92,16 +92,3 @@ class GroupOrder < ActiveRecord::Base end -# == Schema Information -# -# Table name: group_orders -# -# id :integer(4) not null, primary key -# ordergroup_id :integer(4) default(0), not null -# order_id :integer(4) default(0), not null -# price :decimal(8, 2) default(0.0), not null -# lock_version :integer(4) default(0), not null -# updated_on :datetime not null -# updated_by_user_id :integer(4) -# - diff --git a/app/models/group_order_article.rb b/app/models/group_order_article.rb index 2ec41405..36c7ca51 100644 --- a/app/models/group_order_article.rb +++ b/app/models/group_order_article.rb @@ -181,16 +181,3 @@ class GroupOrderArticle < ActiveRecord::Base end -# == Schema Information -# -# Table name: group_order_articles -# -# id :integer(4) not null, primary key -# group_order_id :integer(4) default(0), not null -# order_article_id :integer(4) default(0), not null -# quantity :integer(4) default(0), not null -# tolerance :integer(4) default(0), not null -# updated_on :datetime not null -# result :decimal(8, 3) -# - diff --git a/app/models/group_order_article_quantity.rb b/app/models/group_order_article_quantity.rb index 5d31fefe..95234f7e 100644 --- a/app/models/group_order_article_quantity.rb +++ b/app/models/group_order_article_quantity.rb @@ -11,14 +11,3 @@ class GroupOrderArticleQuantity < ActiveRecord::Base end -# == Schema Information -# -# Table name: group_order_article_quantities -# -# id :integer(4) not null, primary key -# group_order_article_id :integer(4) default(0), not null -# quantity :integer(4) default(0) -# tolerance :integer(4) default(0) -# created_on :datetime not null -# - diff --git a/app/models/invite.rb b/app/models/invite.rb index b9c921eb..b90dc3bb 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -37,15 +37,3 @@ class Invite < ActiveRecord::Base end -# == Schema Information -# -# Table name: invites -# -# id :integer(4) not null, primary key -# token :string(255) default(""), not null -# expires_at :datetime not null -# group_id :integer(4) default(0), not null -# user_id :integer(4) default(0), not null -# email :string(255) default(""), not null -# - diff --git a/app/models/invoice.rb b/app/models/invoice.rb index 12603ab1..0feb3ede 100644 --- a/app/models/invoice.rb +++ b/app/models/invoice.rb @@ -19,22 +19,3 @@ class Invoice < ActiveRecord::Base end -# == Schema Information -# -# Table name: invoices -# -# id :integer(4) not null, primary key -# supplier_id :integer(4) -# delivery_id :integer(4) -# order_id :integer(4) -# number :string(255) -# date :date -# paid_on :date -# note :text -# amount :decimal(8, 2) default(0.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# deposit_credit :decimal(8, 2) default(0.0), not null -# created_at :datetime -# updated_at :datetime -# - diff --git a/app/models/membership.rb b/app/models/membership.rb index 196e63bb..6c2a2263 100644 --- a/app/models/membership.rb +++ b/app/models/membership.rb @@ -16,12 +16,3 @@ class Membership < ActiveRecord::Base end end -# == Schema Information -# -# Table name: memberships -# -# id :integer(4) not null, primary key -# group_id :integer(4) default(0), not null -# user_id :integer(4) default(0), not null -# - diff --git a/app/models/message.rb b/app/models/message.rb index 85682ad6..42cbd520 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -86,17 +86,3 @@ class Message < ActiveRecord::Base end -# == Schema Information -# -# Table name: messages -# -# id :integer(4) not null, primary key -# sender_id :integer(4) -# recipients_ids :text -# subject :string(255) not null -# body :text -# email_state :integer(4) default(0), not null -# private :boolean(1) default(FALSE) -# created_at :datetime -# - diff --git a/app/models/order.rb b/app/models/order.rb index 7578bbc3..160f664c 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -220,18 +220,3 @@ class Order < ActiveRecord::Base end -# == Schema Information -# -# Table name: orders -# -# id :integer(4) not null, primary key -# supplier_id :integer(4) -# note :text -# starts :datetime -# ends :datetime -# state :string(255) default("open") -# lock_version :integer(4) default(0), not null -# updated_by_user_id :integer(4) -# foodcoop_result :decimal(8, 2) -# - diff --git a/app/models/order_article.rb b/app/models/order_article.rb index 31cd321c..65d19577 100644 --- a/app/models/order_article.rb +++ b/app/models/order_article.rb @@ -130,17 +130,3 @@ class OrderArticle < ActiveRecord::Base end -# == Schema Information -# -# Table name: order_articles -# -# id :integer(4) not null, primary key -# order_id :integer(4) default(0), not null -# article_id :integer(4) default(0), not null -# quantity :integer(4) default(0), not null -# tolerance :integer(4) default(0), not null -# units_to_order :integer(4) default(0), not null -# lock_version :integer(4) default(0), not null -# article_price_id :integer(4) -# - diff --git a/app/models/order_comment.rb b/app/models/order_comment.rb index 01042bac..1b0b0e39 100644 --- a/app/models/order_comment.rb +++ b/app/models/order_comment.rb @@ -7,14 +7,3 @@ class OrderComment < ActiveRecord::Base validates_length_of :text, :minimum => 3 end -# == Schema Information -# -# Table name: order_comments -# -# id :integer(4) not null, primary key -# order_id :integer(4) -# user_id :integer(4) -# text :text -# created_at :datetime -# - diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb index d4cc7242..b6498649 100644 --- a/app/models/ordergroup.rb +++ b/app/models/ordergroup.rb @@ -97,32 +97,3 @@ class Ordergroup < Group end -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# - diff --git a/app/models/page.rb b/app/models/page.rb index fba8cde9..3f07c77c 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -52,19 +52,3 @@ class Page < ActiveRecord::Base end end -# == Schema Information -# -# Table name: pages -# -# id :integer(4) not null, primary key -# title :string(255) -# body :text -# permalink :string(255) -# lock_version :integer(4) default(0) -# updated_by :integer(4) -# redirect :integer(4) -# parent_id :integer(4) -# created_at :datetime -# updated_at :datetime -# - diff --git a/app/models/shared_article.rb b/app/models/shared_article.rb index 7a99f41a..58562357 100644 --- a/app/models/shared_article.rb +++ b/app/models/shared_article.rb @@ -1,27 +1,3 @@ -# == Schema Information -# Schema version: 20090102171850 -# -# Table name: articles -# -# id :integer(4) not null, primary key -# name :string(255) not null -# supplier_id :integer(4) not null -# number :string(255) -# note :string(255) -# manufacturer :string(255) -# origin :string(255) -# unit :string(255) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(3, 1) default(7.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :decimal(4, 1) default(1.0), not null -# scale_quantity :decimal(4, 2) -# scale_price :decimal(8, 2) -# created_on :datetime -# updated_on :datetime -# list :string(255) -# - class SharedArticle < ActiveRecord::Base # connect to database from sharedLists-Application diff --git a/app/models/shared_supplier.rb b/app/models/shared_supplier.rb index 0a7837f8..5038bce5 100644 --- a/app/models/shared_supplier.rb +++ b/app/models/shared_supplier.rb @@ -14,26 +14,3 @@ class SharedSupplier < ActiveRecord::Base end -# == Schema Information -# -# Table name: suppliers -# -# id :integer(4) not null, primary key -# name :string(255) not null -# address :string(255) not null -# phone :string(255) not null -# phone2 :string(255) -# fax :string(255) -# email :string(255) -# url :string(255) -# delivery_days :string(255) -# note :string(255) -# created_on :datetime -# updated_on :datetime -# lists :string(255) -# bnn_sync :boolean(1) default(FALSE) -# bnn_host :string(255) -# bnn_user :string(255) -# bnn_password :string(255) -# - diff --git a/app/models/stock_article.rb b/app/models/stock_article.rb index 97ca9a55..59f29238 100644 --- a/app/models/stock_article.rb +++ b/app/models/stock_article.rb @@ -41,29 +41,3 @@ class StockArticle < Article end end -# == Schema Information -# -# Table name: articles -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# supplier_id :integer(4) default(0), not null -# article_category_id :integer(4) default(0), not null -# unit :string(255) default(""), not null -# note :string(255) -# availability :boolean(1) default(TRUE), not null -# manufacturer :string(255) -# origin :string(255) -# shared_updated_on :datetime -# price :decimal(8, 2) -# tax :float -# deposit :decimal(8, 2) default(0.0) -# unit_quantity :integer(4) default(1), not null -# order_number :string(255) -# created_at :datetime -# updated_at :datetime -# deleted_at :datetime -# type :string(255) -# quantity :integer(4) default(0) -# - diff --git a/app/models/stock_change.rb b/app/models/stock_change.rb index 7797dc11..6a7adc75 100644 --- a/app/models/stock_change.rb +++ b/app/models/stock_change.rb @@ -16,16 +16,3 @@ class StockChange < ActiveRecord::Base end end -# == Schema Information -# -# Table name: stock_changes -# -# id :integer(4) not null, primary key -# delivery_id :integer(4) -# order_id :integer(4) -# stock_article_id :integer(4) -# quantity :integer(4) default(0) -# created_at :datetime -# stock_taking_id :integer(4) -# - diff --git a/app/models/stock_taking.rb b/app/models/stock_taking.rb index a5c6b335..0348459c 100644 --- a/app/models/stock_taking.rb +++ b/app/models/stock_taking.rb @@ -12,13 +12,3 @@ class StockTaking < ActiveRecord::Base end end -# == Schema Information -# -# Table name: stock_takings -# -# id :integer(4) not null, primary key -# date :date -# note :text -# created_at :datetime -# - diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 8df6b6b0..bda0a7ff 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -67,25 +67,3 @@ class Supplier < ActiveRecord::Base end end -# == Schema Information -# -# Table name: suppliers -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# address :string(255) default(""), not null -# phone :string(255) default(""), not null -# phone2 :string(255) -# fax :string(255) -# email :string(255) -# url :string(255) -# contact_person :string(255) -# customer_number :string(255) -# delivery_days :string(255) -# order_howto :string(255) -# note :string(255) -# shared_supplier_id :integer(4) -# min_order_quantity :string(255) -# deleted_at :datetime -# - diff --git a/app/models/task.rb b/app/models/task.rb index 5857a37a..8c629435 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -74,21 +74,3 @@ class Task < ActiveRecord::Base end end -# == Schema Information -# -# Table name: tasks -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# due_date :date -# done :boolean(1) default(FALSE) -# workgroup_id :integer(4) -# assigned :boolean(1) default(FALSE) -# created_on :datetime not null -# updated_on :datetime not null -# required_users :integer(4) default(1) -# weekly :boolean(1) -# duration :integer(4) default(1) -# - diff --git a/app/models/user.rb b/app/models/user.rb index f8bef9e2..c7cd3bd2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -193,21 +193,3 @@ class User < ActiveRecord::Base end -# == Schema Information -# -# Table name: users -# -# id :integer(4) not null, primary key -# nick :string(255) default(""), not null -# password_hash :string(255) default(""), not null -# password_salt :string(255) default(""), not null -# first_name :string(255) default(""), not null -# last_name :string(255) default(""), not null -# email :string(255) default(""), not null -# phone :string(255) -# created_on :datetime not null -# reset_password_token :string(255) -# reset_password_expires :datetime -# last_login :datetime -# - diff --git a/app/models/workgroup.rb b/app/models/workgroup.rb index 0cecac10..b5b570d2 100644 --- a/app/models/workgroup.rb +++ b/app/models/workgroup.rb @@ -67,32 +67,3 @@ class Workgroup < Group end -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# - diff --git a/config/environments/development.rb.SAMPLE b/config/environments/development.rb.SAMPLE index 65e4011f..11e14527 100644 --- a/config/environments/development.rb.SAMPLE +++ b/config/environments/development.rb.SAMPLE @@ -22,9 +22,4 @@ Foodsoft::Application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin -end - -# Enable hirb for better console formatting -require "hirb" -Hirb.enable - \ No newline at end of file +end \ No newline at end of file diff --git a/test/fixtures/article_categories.yml b/test/fixtures/article_categories.yml index 2d6bd13c..3c2701fc 100644 --- a/test/fixtures/article_categories.yml +++ b/test/fixtures/article_categories.yml @@ -7,12 +7,3 @@ vegi: other: name: Other stuff -# == Schema Information -# -# Table name: article_categories -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# - diff --git a/test/fixtures/article_prices.yml b/test/fixtures/article_prices.yml index 2184911f..5f4e33ba 100644 --- a/test/fixtures/article_prices.yml +++ b/test/fixtures/article_prices.yml @@ -36,16 +36,3 @@ applejuice1: deposit: 0.15 created_at: <%= Time.now.to_s(:db) %> -# == Schema Information -# -# Table name: article_prices -# -# id :integer(4) not null, primary key -# article_id :integer(4) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(8, 2) default(0.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :integer(4) -# created_at :datetime -# - diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml index 3fa9adb4..125bd282 100644 --- a/test/fixtures/articles.yml +++ b/test/fixtures/articles.yml @@ -81,26 +81,3 @@ applejuice: -# == Schema Information -# -# Table name: articles -# -# id :integer(4) not null, primary key -# name :string(255) not null -# supplier_id :integer(4) not null -# number :string(255) -# note :string(255) -# manufacturer :string(255) -# origin :string(255) -# unit :string(255) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(3, 1) default(7.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :decimal(4, 1) default(1.0), not null -# scale_quantity :decimal(4, 2) -# scale_price :decimal(8, 2) -# created_on :datetime -# updated_on :datetime -# list :string(255) -# - diff --git a/test/fixtures/assignments.yml b/test/fixtures/assignments.yml index bc7748bc..bd73671d 100644 --- a/test/fixtures/assignments.yml +++ b/test/fixtures/assignments.yml @@ -1,13 +1,3 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: assignments -# -# id :integer(4) not null, primary key -# user_id :integer(4) default(0), not null -# task_id :integer(4) default(0), not null -# accepted :boolean(1) default(FALSE) -# - diff --git a/test/fixtures/financial_transactions.yml b/test/fixtures/financial_transactions.yml index 7fc6dbd3..1757b316 100644 --- a/test/fixtures/financial_transactions.yml +++ b/test/fixtures/financial_transactions.yml @@ -12,15 +12,3 @@ bananas2: note: Paying in from <%= 1.weeks.ago.strftime("%d.%m.%Y") %> created_on: <%= 1.weeks.ago.to_s(:db) %> -# == Schema Information -# -# Table name: financial_transactions -# -# id :integer(4) not null, primary key -# ordergroup_id :integer(4) default(0), not null -# amount :decimal(8, 2) default(0.0), not null -# note :text default(""), not null -# user_id :integer(4) default(0), not null -# created_on :datetime not null -# - diff --git a/test/fixtures/group_order_article_quantities.yml b/test/fixtures/group_order_article_quantities.yml index c4685ea7..bd73671d 100644 --- a/test/fixtures/group_order_article_quantities.yml +++ b/test/fixtures/group_order_article_quantities.yml @@ -1,14 +1,3 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: group_order_article_quantities -# -# id :integer(4) not null, primary key -# group_order_article_id :integer(4) default(0), not null -# quantity :integer(4) default(0) -# tolerance :integer(4) default(0) -# created_on :datetime not null -# - diff --git a/test/fixtures/groups.yml b/test/fixtures/groups.yml index 0a629e2f..af0e71b4 100644 --- a/test/fixtures/groups.yml +++ b/test/fixtures/groups.yml @@ -20,32 +20,3 @@ bananas: -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# - diff --git a/test/fixtures/memberships.yml b/test/fixtures/memberships.yml index d52b7c87..c42847a2 100644 --- a/test/fixtures/memberships.yml +++ b/test/fixtures/memberships.yml @@ -7,12 +7,3 @@ second: user: test -# == Schema Information -# -# Table name: memberships -# -# id :integer(4) not null, primary key -# group_id :integer(4) default(0), not null -# user_id :integer(4) default(0), not null -# - diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml index d8ce3e5b..44329eae 100644 --- a/test/fixtures/messages.yml +++ b/test/fixtures/messages.yml @@ -2,17 +2,3 @@ -# == Schema Information -# -# Table name: messages -# -# id :integer(4) not null, primary key -# sender_id :integer(4) -# recipients_ids :text -# subject :string(255) not null -# body :text -# email_state :integer(4) default(0), not null -# private :boolean(1) default(FALSE) -# created_at :datetime -# - diff --git a/test/fixtures/order_comments.yml b/test/fixtures/order_comments.yml index 578adb66..e5954334 100644 --- a/test/fixtures/order_comments.yml +++ b/test/fixtures/order_comments.yml @@ -1,13 +1,2 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: order_comments -# -# id :integer(4) not null, primary key -# order_id :integer(4) -# user_id :integer(4) -# text :text -# created_at :datetime -# - diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml index 5b568a9e..e5954334 100644 --- a/test/fixtures/orders.yml +++ b/test/fixtures/orders.yml @@ -1,17 +1,2 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: orders -# -# id :integer(4) not null, primary key -# supplier_id :integer(4) -# note :text -# starts :datetime -# ends :datetime -# state :string(255) default("open") -# lock_version :integer(4) default(0), not null -# updated_by_user_id :integer(4) -# foodcoop_result :decimal(8, 2) -# - diff --git a/test/fixtures/pages.yml b/test/fixtures/pages.yml index 28ac36dd..0268b437 100644 --- a/test/fixtures/pages.yml +++ b/test/fixtures/pages.yml @@ -11,19 +11,3 @@ two: permalink: MyString -# == Schema Information -# -# Table name: pages -# -# id :integer(4) not null, primary key -# title :string(255) -# body :text -# permalink :string(255) -# lock_version :integer(4) default(0) -# updated_by :integer(4) -# redirect :integer(4) -# parent_id :integer(4) -# created_at :datetime -# updated_at :datetime -# - diff --git a/test/fixtures/stock_changes.yml b/test/fixtures/stock_changes.yml index b73ff84e..e5954334 100644 --- a/test/fixtures/stock_changes.yml +++ b/test/fixtures/stock_changes.yml @@ -1,15 +1,2 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: stock_changes -# -# id :integer(4) not null, primary key -# delivery_id :integer(4) -# order_id :integer(4) -# stock_article_id :integer(4) -# quantity :integer(4) default(0) -# created_at :datetime -# stock_taking_id :integer(4) -# - diff --git a/test/fixtures/stock_takings.yml b/test/fixtures/stock_takings.yml index 76c92f53..bd73671d 100644 --- a/test/fixtures/stock_takings.yml +++ b/test/fixtures/stock_takings.yml @@ -1,13 +1,3 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# == Schema Information -# -# Table name: stock_takings -# -# id :integer(4) not null, primary key -# date :date -# note :text -# created_at :datetime -# - diff --git a/test/fixtures/suppliers.yml b/test/fixtures/suppliers.yml index 7999fb92..dc0a4049 100644 --- a/test/fixtures/suppliers.yml +++ b/test/fixtures/suppliers.yml @@ -47,26 +47,3 @@ terra: -# == Schema Information -# -# Table name: suppliers -# -# id :integer(4) not null, primary key -# name :string(255) not null -# address :string(255) not null -# phone :string(255) not null -# phone2 :string(255) -# fax :string(255) -# email :string(255) -# url :string(255) -# delivery_days :string(255) -# note :string(255) -# created_on :datetime -# updated_on :datetime -# lists :string(255) -# bnn_sync :boolean(1) default(FALSE) -# bnn_host :string(255) -# bnn_user :string(255) -# bnn_password :string(255) -# - diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml index d6e38b5d..44329eae 100644 --- a/test/fixtures/tasks.yml +++ b/test/fixtures/tasks.yml @@ -2,21 +2,3 @@ -# == Schema Information -# -# Table name: tasks -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# due_date :date -# done :boolean(1) default(FALSE) -# workgroup_id :integer(4) -# assigned :boolean(1) default(FALSE) -# created_on :datetime not null -# updated_on :datetime not null -# required_users :integer(4) default(1) -# weekly :boolean(1) -# duration :integer(4) default(1) -# - diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index da16ed74..60ef6cae 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -16,21 +16,3 @@ test: password_salt: DxnbIF1h created_on: <%= Time.now.to_s(:db) %> -# == Schema Information -# -# Table name: users -# -# id :integer(4) not null, primary key -# nick :string(255) default(""), not null -# password_hash :string(255) default(""), not null -# password_salt :string(255) default(""), not null -# first_name :string(255) default(""), not null -# last_name :string(255) default(""), not null -# email :string(255) default(""), not null -# phone :string(255) -# created_on :datetime not null -# reset_password_token :string(255) -# reset_password_expires :datetime -# last_login :datetime -# - diff --git a/test/unit/article_category_test.rb b/test/unit/article_category_test.rb index e51a1ead..ae89e02b 100644 --- a/test/unit/article_category_test.rb +++ b/test/unit/article_category_test.rb @@ -9,12 +9,3 @@ class ArticleCategoryTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: article_categories -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# - diff --git a/test/unit/article_price_test.rb b/test/unit/article_price_test.rb index 91ec43ff..1dc8a7aa 100644 --- a/test/unit/article_price_test.rb +++ b/test/unit/article_price_test.rb @@ -7,16 +7,3 @@ class ArticlePriceTest < ActiveSupport::TestCase end end -# == Schema Information -# -# Table name: article_prices -# -# id :integer(4) not null, primary key -# article_id :integer(4) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(8, 2) default(0.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :integer(4) -# created_at :datetime -# - diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 5860cd2b..813dcbc9 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1,29 +1,3 @@ -# == Schema Information -# -# Table name: articles -# -# id :integer not null, primary key -# name :string(255) default(""), not null -# supplier_id :integer default(0), not null -# article_category_id :integer default(0), not null -# unit :string(255) default(""), not null -# note :string(255) -# availability :boolean default(TRUE), not null -# manufacturer :string(255) -# origin :string(255) -# shared_updated_on :datetime -# price :decimal(, ) -# tax :float -# deposit :decimal(, ) default(0.0) -# unit_quantity :integer default(1), not null -# order_number :string(255) -# created_at :datetime -# updated_at :datetime -# quantity :integer default(0) -# deleted_at :datetime -# type :string(255) -# - require File.dirname(__FILE__) + '/../test_helper' class ArticleTest < Test::Unit::TestCase diff --git a/test/unit/assignment_test.rb b/test/unit/assignment_test.rb index 030ae4c3..2bdd0867 100644 --- a/test/unit/assignment_test.rb +++ b/test/unit/assignment_test.rb @@ -10,13 +10,3 @@ class AssignmentTest < Test::Unit::TestCase end -# == Schema Information -# -# Table name: assignments -# -# id :integer(4) not null, primary key -# user_id :integer(4) default(0), not null -# task_id :integer(4) default(0), not null -# accepted :boolean(1) default(FALSE) -# - diff --git a/test/unit/financial_transaction_test.rb b/test/unit/financial_transaction_test.rb index c9eac54d..82471198 100644 --- a/test/unit/financial_transaction_test.rb +++ b/test/unit/financial_transaction_test.rb @@ -9,15 +9,3 @@ class FinancialTransactionTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: financial_transactions -# -# id :integer(4) not null, primary key -# ordergroup_id :integer(4) default(0), not null -# amount :decimal(8, 2) default(0.0), not null -# note :text default(""), not null -# user_id :integer(4) default(0), not null -# created_on :datetime not null -# - diff --git a/test/unit/group_order_article_quantity_test.rb b/test/unit/group_order_article_quantity_test.rb index 175ba34c..c7b75f2d 100644 --- a/test/unit/group_order_article_quantity_test.rb +++ b/test/unit/group_order_article_quantity_test.rb @@ -9,14 +9,3 @@ class GroupOrderArticleQuantityTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: group_order_article_quantities -# -# id :integer(4) not null, primary key -# group_order_article_id :integer(4) default(0), not null -# quantity :integer(4) default(0) -# tolerance :integer(4) default(0) -# created_on :datetime not null -# - diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index 9fb911e5..ef9a417d 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -12,32 +12,3 @@ end -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# - diff --git a/test/unit/membership_test.rb b/test/unit/membership_test.rb index 04d21fa5..94f3d117 100644 --- a/test/unit/membership_test.rb +++ b/test/unit/membership_test.rb @@ -9,12 +9,3 @@ class MembershipTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: memberships -# -# id :integer(4) not null, primary key -# group_id :integer(4) default(0), not null -# user_id :integer(4) default(0), not null -# - diff --git a/test/unit/order_comment_test.rb b/test/unit/order_comment_test.rb index a9715280..501cec0f 100644 --- a/test/unit/order_comment_test.rb +++ b/test/unit/order_comment_test.rb @@ -7,14 +7,3 @@ class OrderCommentTest < ActiveSupport::TestCase end end -# == Schema Information -# -# Table name: order_comments -# -# id :integer(4) not null, primary key -# order_id :integer(4) -# user_id :integer(4) -# text :text -# created_at :datetime -# - diff --git a/test/unit/order_test.rb b/test/unit/order_test.rb index 6ff760b2..af17d71a 100644 --- a/test/unit/order_test.rb +++ b/test/unit/order_test.rb @@ -9,18 +9,3 @@ class OrderTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: orders -# -# id :integer(4) not null, primary key -# supplier_id :integer(4) -# note :text -# starts :datetime -# ends :datetime -# state :string(255) default("open") -# lock_version :integer(4) default(0), not null -# updated_by_user_id :integer(4) -# foodcoop_result :decimal(8, 2) -# - diff --git a/test/unit/page_test.rb b/test/unit/page_test.rb index 1e95d99d..e84408b6 100644 --- a/test/unit/page_test.rb +++ b/test/unit/page_test.rb @@ -8,19 +8,3 @@ class PageTest < ActiveSupport::TestCase end -# == Schema Information -# -# Table name: pages -# -# id :integer(4) not null, primary key -# title :string(255) -# body :text -# permalink :string(255) -# lock_version :integer(4) default(0) -# updated_by :integer(4) -# redirect :integer(4) -# parent_id :integer(4) -# created_at :datetime -# updated_at :datetime -# - diff --git a/test/unit/shared_article_test.rb b/test/unit/shared_article_test.rb index f88e93e5..4c5485ef 100644 --- a/test/unit/shared_article_test.rb +++ b/test/unit/shared_article_test.rb @@ -1,27 +1,3 @@ -# == Schema Information -# Schema version: 20090317175355 -# -# Table name: articles -# -# id :integer(4) not null, primary key -# name :string(255) not null -# supplier_id :integer(4) not null -# number :string(255) -# note :string(255) -# manufacturer :string(255) -# origin :string(255) -# unit :string(255) -# price :decimal(8, 2) default(0.0), not null -# tax :decimal(3, 1) default(7.0), not null -# deposit :decimal(8, 2) default(0.0), not null -# unit_quantity :decimal(4, 1) default(1.0), not null -# scale_quantity :decimal(4, 2) -# scale_price :decimal(8, 2) -# created_on :datetime -# updated_on :datetime -# list :string(255) -# - require File.dirname(__FILE__) + '/../test_helper' class SharedArticleTest < Test::Unit::TestCase diff --git a/test/unit/shared_supplier_test.rb b/test/unit/shared_supplier_test.rb index 4fd6f0ca..5d184ffa 100644 --- a/test/unit/shared_supplier_test.rb +++ b/test/unit/shared_supplier_test.rb @@ -9,26 +9,3 @@ class SharedSupplierTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: suppliers -# -# id :integer(4) not null, primary key -# name :string(255) not null -# address :string(255) not null -# phone :string(255) not null -# phone2 :string(255) -# fax :string(255) -# email :string(255) -# url :string(255) -# delivery_days :string(255) -# note :string(255) -# created_on :datetime -# updated_on :datetime -# lists :string(255) -# bnn_sync :boolean(1) default(FALSE) -# bnn_host :string(255) -# bnn_user :string(255) -# bnn_password :string(255) -# - diff --git a/test/unit/stock_article_test.rb b/test/unit/stock_article_test.rb index 3808039a..8a9f2c04 100644 --- a/test/unit/stock_article_test.rb +++ b/test/unit/stock_article_test.rb @@ -8,29 +8,3 @@ class StockArticleTest < ActiveSupport::TestCase end -# == Schema Information -# -# Table name: articles -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# supplier_id :integer(4) default(0), not null -# article_category_id :integer(4) default(0), not null -# unit :string(255) default(""), not null -# note :string(255) -# availability :boolean(1) default(TRUE), not null -# manufacturer :string(255) -# origin :string(255) -# shared_updated_on :datetime -# price :decimal(8, 2) -# tax :float -# deposit :decimal(8, 2) default(0.0) -# unit_quantity :integer(4) default(1), not null -# order_number :string(255) -# created_at :datetime -# updated_at :datetime -# deleted_at :datetime -# type :string(255) -# quantity :integer(4) default(0) -# - diff --git a/test/unit/stock_change_test.rb b/test/unit/stock_change_test.rb index 12905bc3..bcd00f9a 100644 --- a/test/unit/stock_change_test.rb +++ b/test/unit/stock_change_test.rb @@ -7,16 +7,3 @@ class StockChangeTest < ActiveSupport::TestCase end end -# == Schema Information -# -# Table name: stock_changes -# -# id :integer(4) not null, primary key -# delivery_id :integer(4) -# order_id :integer(4) -# stock_article_id :integer(4) -# quantity :integer(4) default(0) -# created_at :datetime -# stock_taking_id :integer(4) -# - diff --git a/test/unit/stock_taking_test.rb b/test/unit/stock_taking_test.rb index aeb5da29..5440f6ed 100644 --- a/test/unit/stock_taking_test.rb +++ b/test/unit/stock_taking_test.rb @@ -7,13 +7,3 @@ class StockTakingTest < ActiveSupport::TestCase end end -# == Schema Information -# -# Table name: stock_takings -# -# id :integer(4) not null, primary key -# date :date -# note :text -# created_at :datetime -# - diff --git a/test/unit/supplier_test.rb b/test/unit/supplier_test.rb index edbf32af..f8db2bf0 100644 --- a/test/unit/supplier_test.rb +++ b/test/unit/supplier_test.rb @@ -21,25 +21,3 @@ class SupplierTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: suppliers -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# address :string(255) default(""), not null -# phone :string(255) default(""), not null -# phone2 :string(255) -# fax :string(255) -# email :string(255) -# url :string(255) -# contact_person :string(255) -# customer_number :string(255) -# delivery_days :string(255) -# order_howto :string(255) -# note :string(255) -# shared_supplier_id :integer(4) -# min_order_quantity :string(255) -# deleted_at :datetime -# - diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb index af6b935d..3c2c1188 100644 --- a/test/unit/task_test.rb +++ b/test/unit/task_test.rb @@ -11,21 +11,3 @@ end -# == Schema Information -# -# Table name: tasks -# -# id :integer(4) not null, primary key -# name :string(255) default(""), not null -# description :string(255) -# due_date :date -# done :boolean(1) default(FALSE) -# workgroup_id :integer(4) -# assigned :boolean(1) default(FALSE) -# created_on :datetime not null -# updated_on :datetime not null -# required_users :integer(4) default(1) -# weekly :boolean(1) -# duration :integer(4) default(1) -# - diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 38e82adb..c7223272 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -32,21 +32,3 @@ class UserTest < Test::Unit::TestCase end end -# == Schema Information -# -# Table name: users -# -# id :integer(4) not null, primary key -# nick :string(255) default(""), not null -# password_hash :string(255) default(""), not null -# password_salt :string(255) default(""), not null -# first_name :string(255) default(""), not null -# last_name :string(255) default(""), not null -# email :string(255) default(""), not null -# phone :string(255) -# created_on :datetime not null -# reset_password_token :string(255) -# reset_password_expires :datetime -# last_login :datetime -# - diff --git a/test/unit/workgroup_test.rb b/test/unit/workgroup_test.rb index 7c88d19c..a6e56cbd 100644 --- a/test/unit/workgroup_test.rb +++ b/test/unit/workgroup_test.rb @@ -10,32 +10,3 @@ end -# == Schema Information -# -# Table name: groups -# -# id :integer(4) not null, primary key -# type :string(255) default(""), not null -# name :string(255) default(""), not null -# description :string(255) -# account_balance :decimal(8, 2) default(0.0), not null -# account_updated :datetime -# created_on :datetime not null -# role_admin :boolean(1) default(FALSE), not null -# role_suppliers :boolean(1) default(FALSE), not null -# role_article_meta :boolean(1) default(FALSE), not null -# role_finance :boolean(1) default(FALSE), not null -# role_orders :boolean(1) default(FALSE), not null -# weekly_task :boolean(1) default(FALSE) -# weekday :integer(4) -# task_name :string(255) -# task_description :string(255) -# task_required_users :integer(4) default(1) -# deleted_at :datetime -# contact_person :string(255) -# contact_phone :string(255) -# contact_address :string(255) -# stats :text -# task_duration :integer(4) default(1) -# -