Merge branch 'wiki'

test/fixtures/article_categories.yml

@@ -2,7 +2,7 @@
 #
 # Table name: article_categories
 #
-#  id          :integer(4)      not null, primary key
+#  id          :integer         not null, primary key
 #  name        :string(255)     default(""), not null
 #  description :string(255)
 #

test/fixtures/article_prices.yml

@@ -2,12 +2,12 @@
 #
 # Table name: article_prices
 #
-#  id            :integer(4)      not null, primary key
-#  article_id    :integer(4)
+#  id            :integer         not null, primary key
+#  article_id    :integer
 #  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)
+#  unit_quantity :integer
 #  created_at    :datetime
 #
 

test/fixtures/articles.yml

@@ -2,6 +2,36 @@
 #
 # 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)
+#
+
+# == Schema Information
+<<<<<<< HEAD:test/fixtures/articles.yml
+=======
+# Schema version: 20090325175756
+>>>>>>> wiki:test/fixtures/articles.yml
+#
+# Table name: articles
+#
 #  id                  :integer(4)      not null, primary key
 #  name                :string(255)     default(""), not null
 #  supplier_id         :integer(4)      default(0), not null

test/fixtures/assignments.yml

@@ -2,10 +2,10 @@
 #
 # 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)
+#  id       :integer         not null, primary key
+#  user_id  :integer         default(0), not null
+#  task_id  :integer         default(0), not null
+#  accepted :boolean
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/financial_transactions.yml

@@ -2,11 +2,11 @@
 #
 # Table name: financial_transactions
 #
-#  id            :integer(4)      not null, primary key
-#  ordergroup_id :integer(4)      default(0), not null
+#  id            :integer         not null, primary key
+#  ordergroup_id :integer         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
+#  note          :text            not null
+#  user_id       :integer         default(0), not null
 #  created_on    :datetime        not null
 #
 

test/fixtures/group_order_article_quantities.yml

@@ -2,10 +2,10 @@
 #
 # 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)
+#  id                     :integer         not null, primary key
+#  group_order_article_id :integer         default(0), not null
+#  quantity               :integer         default(0)
+#  tolerance              :integer         default(0)
 #  created_on             :datetime        not null
 #
 

test/fixtures/groups.yml

@@ -2,28 +2,27 @@
 #
 # Table name: groups
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         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_balance     :decimal(, )     default(0.0), not null
 #  account_updated     :datetime
 #  created_on          :datetime        not null
-#  role_admin          :boolean(1)      not null
-#  role_suppliers      :boolean(1)      not null
-#  role_article_meta   :boolean(1)      not null
-#  role_finance        :boolean(1)      not null
-#  role_orders         :boolean(1)      not null
-#  weekly_task         :boolean(1)
-#  weekday             :integer(4)
+#  role_admin          :boolean         not null
+#  role_suppliers      :boolean         not null
+#  role_article_meta   :boolean         not null
+#  role_finance        :boolean         not null
+#  role_orders         :boolean         not null
+#  weekly_task         :boolean
+#  weekday             :integer
 #  task_name           :string(255)
 #  task_description    :string(255)
-#  task_required_users :integer(4)      default(1)
+#  task_required_users :integer         default(1)
 #  deleted_at          :datetime
 #  contact_person      :string(255)
 #  contact_phone       :string(255)
 #  contact_address     :string(255)
-#  stats               :text
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/memberships.yml

@@ -2,9 +2,9 @@
 #
 # 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
+#  id       :integer         not null, primary key
+#  group_id :integer         default(0), not null
+#  user_id  :integer         default(0), not null
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/messages.yml

@@ -2,13 +2,13 @@
 #
 # Table name: messages
 #
-#  id             :integer(4)      not null, primary key
-#  sender_id      :integer(4)
+#  id             :integer         not null, primary key
+#  sender_id      :integer
 #  recipients_ids :text
 #  subject        :string(255)     not null
 #  body           :text
-#  email_state    :integer(4)      default(0), not null
-#  private        :boolean(1)
+#  email_state    :integer         default(0), not null
+#  private        :boolean
 #  created_at     :datetime
 #
 

test/fixtures/order_comments.yml

@@ -2,9 +2,9 @@
 #
 # Table name: order_comments
 #
-#  id         :integer(4)      not null, primary key
-#  order_id   :integer(4)
-#  user_id    :integer(4)
+#  id         :integer         not null, primary key
+#  order_id   :integer
+#  user_id    :integer
 #  text       :text
 #  created_at :datetime
 #

test/fixtures/orders.yml

@@ -2,14 +2,14 @@
 #
 # Table name: orders
 #
-#  id                 :integer(4)      not null, primary key
-#  supplier_id        :integer(4)
+#  id                 :integer         not null, primary key
+#  supplier_id        :integer
 #  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)
+#  lock_version       :integer         default(0), not null
+#  updated_by_user_id :integer
 #  foodcoop_result    :decimal(8, 2)
 #
 

test/fixtures/pages.yml

@@ -0,0 +1,26 @@
+# == Schema Information
+#
+# Table name: pages
+#
+#  id           :integer         not null, primary key
+#  title        :string(255)
+#  body         :text
+#  permalink    :string(255)
+#  lock_version :integer         default(0)
+#  updated_by   :integer
+#  redirect     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  title: MyString
+  body: MyText
+  permalink: MyString
+
+two:
+  title: MyString
+  body: MyText
+  permalink: MyString

test/fixtures/stock_changes.yml

@@ -2,13 +2,13 @@
 #
 # 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)
+#  id               :integer         not null, primary key
+#  delivery_id      :integer
+#  order_id         :integer
+#  stock_article_id :integer
+#  quantity         :integer         default(0)
 #  created_at       :datetime
-#  stock_taking_id  :integer(4)
+#  stock_taking_id  :integer
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/stock_takings.yml

@@ -2,7 +2,7 @@
 #
 # Table name: stock_takings
 #
-#  id         :integer(4)      not null, primary key
+#  id         :integer         not null, primary key
 #  date       :date
 #  note       :text
 #  created_at :datetime

test/fixtures/suppliers.yml

@@ -17,6 +17,29 @@
 #  lists         :string(255)
 #
 
+# == Schema Information
+<<<<<<< HEAD:test/fixtures/suppliers.yml
+=======
+# Schema version: 20090325175756
+>>>>>>> wiki:test/fixtures/suppliers.yml
+#
+# 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)
+#
+
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 terra:
   name: Terra

test/fixtures/tasks.yml

@@ -2,16 +2,16 @@
 #
 # Table name: tasks
 #
-#  id             :integer(4)      not null, primary key
+#  id             :integer         not null, primary key
 #  name           :string(255)     default(""), not null
 #  description    :string(255)
 #  due_date       :date
-#  done           :boolean(1)
-#  workgroup_id   :integer(4)
-#  assigned       :boolean(1)
+#  done           :boolean
+#  workgroup_id   :integer
+#  assigned       :boolean
 #  created_on     :datetime        not null
 #  updated_on     :datetime        not null
-#  required_users :integer(4)      default(1)
+#  required_users :integer         default(1)
 #
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

test/fixtures/users.yml

@@ -2,7 +2,7 @@
 #
 # Table name: users
 #
-#  id                     :integer(4)      not null, primary key
+#  id                     :integer         not null, primary key
 #  nick                   :string(255)     default(""), not null
 #  password_hash          :string(255)     default(""), not null
 #  password_salt          :string(255)     default(""), not null

test/functional/pages_controller_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class PagesControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:pages)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create page" do
+    assert_difference('Page.count') do
+      post :create, :page => { }
+    end
+
+    assert_redirected_to page_path(assigns(:page))
+  end
+
+  test "should show page" do
+    get :show, :id => pages(:one).id
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, :id => pages(:one).id
+    assert_response :success
+  end
+
+  test "should update page" do
+    put :update, :id => pages(:one).id, :page => { }
+    assert_redirected_to page_path(assigns(:page))
+  end
+
+  test "should destroy page" do
+    assert_difference('Page.count', -1) do
+      delete :destroy, :id => pages(:one).id
+    end
+
+    assert_redirected_to pages_path
+  end
+end

test/unit/article_category_test.rb

@@ -2,7 +2,7 @@
 #
 # Table name: article_categories
 #
-#  id          :integer(4)      not null, primary key
+#  id          :integer         not null, primary key
 #  name        :string(255)     default(""), not null
 #  description :string(255)
 #

test/unit/article_price_test.rb

@@ -2,12 +2,12 @@
 #
 # Table name: article_prices
 #
-#  id            :integer(4)      not null, primary key
-#  article_id    :integer(4)
+#  id            :integer         not null, primary key
+#  article_id    :integer
 #  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)
+#  unit_quantity :integer
 #  created_at    :datetime
 #
 

test/unit/article_test.rb

@@ -2,26 +2,26 @@
 #
 # Table name: articles
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         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
+#  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(1)      default(TRUE), not null
+#  availability        :boolean         default(TRUE), not null
 #  manufacturer        :string(255)
 #  origin              :string(255)
 #  shared_updated_on   :datetime
-#  price               :decimal(8, 2)
+#  price               :decimal(, )
 #  tax                 :float
-#  deposit             :decimal(8, 2)   default(0.0)
-#  unit_quantity       :integer(4)      default(1), not null
+#  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)
-#  quantity            :integer(4)      default(0)
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

test/unit/assignment_test.rb

@@ -2,10 +2,10 @@
 #
 # 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)
+#  id       :integer         not null, primary key
+#  user_id  :integer         default(0), not null
+#  task_id  :integer         default(0), not null
+#  accepted :boolean
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

test/unit/financial_transaction_test.rb

@@ -2,11 +2,11 @@
 #
 # Table name: financial_transactions
 #
-#  id            :integer(4)      not null, primary key
-#  ordergroup_id :integer(4)      default(0), not null
+#  id            :integer         not null, primary key
+#  ordergroup_id :integer         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
+#  note          :text            not null
+#  user_id       :integer         default(0), not null
 #  created_on    :datetime        not null
 #
 

test/unit/group_order_article_quantity_test.rb

@@ -2,10 +2,10 @@
 #
 # 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)
+#  id                     :integer         not null, primary key
+#  group_order_article_id :integer         default(0), not null
+#  quantity               :integer         default(0)
+#  tolerance              :integer         default(0)
 #  created_on             :datetime        not null
 #
 

test/unit/group_test.rb

@@ -2,28 +2,27 @@
 #
 # Table name: groups
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         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_balance     :decimal(, )     default(0.0), not null
 #  account_updated     :datetime
 #  created_on          :datetime        not null
-#  role_admin          :boolean(1)      not null
-#  role_suppliers      :boolean(1)      not null
-#  role_article_meta   :boolean(1)      not null
-#  role_finance        :boolean(1)      not null
-#  role_orders         :boolean(1)      not null
-#  weekly_task         :boolean(1)
-#  weekday             :integer(4)
+#  role_admin          :boolean         not null
+#  role_suppliers      :boolean         not null
+#  role_article_meta   :boolean         not null
+#  role_finance        :boolean         not null
+#  role_orders         :boolean         not null
+#  weekly_task         :boolean
+#  weekday             :integer
 #  task_name           :string(255)
 #  task_description    :string(255)
-#  task_required_users :integer(4)      default(1)
+#  task_required_users :integer         default(1)
 #  deleted_at          :datetime
 #  contact_person      :string(255)
 #  contact_phone       :string(255)
 #  contact_address     :string(255)
-#  stats               :text
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

test/unit/membership_test.rb

@@ -2,9 +2,9 @@
 #
 # 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
+#  id       :integer         not null, primary key
+#  group_id :integer         default(0), not null
+#  user_id  :integer         default(0), not null
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

test/unit/order_comment_test.rb

@@ -2,9 +2,9 @@
 #
 # Table name: order_comments
 #
-#  id         :integer(4)      not null, primary key
-#  order_id   :integer(4)
-#  user_id    :integer(4)
+#  id         :integer         not null, primary key
+#  order_id   :integer
+#  user_id    :integer
 #  text       :text
 #  created_at :datetime
 #

test/unit/order_test.rb

@@ -2,14 +2,14 @@
 #
 # Table name: orders
 #
-#  id                 :integer(4)      not null, primary key
-#  supplier_id        :integer(4)
+#  id                 :integer         not null, primary key
+#  supplier_id        :integer
 #  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)
+#  lock_version       :integer         default(0), not null
+#  updated_by_user_id :integer
 #  foodcoop_result    :decimal(8, 2)
 #
 

test/unit/page_test.rb

@@ -0,0 +1,23 @@
+# == Schema Information
+#
+# Table name: pages
+#
+#  id           :integer         not null, primary key
+#  title        :string(255)
+#  body         :text
+#  permalink    :string(255)
+#  lock_version :integer         default(0)
+#  updated_by   :integer
+#  redirect     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+
+require 'test_helper'
+
+class PageTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

test/unit/stock_article_test.rb

@@ -2,26 +2,26 @@
 #
 # Table name: articles
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         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
+#  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(1)      default(TRUE), not null
+#  availability        :boolean         default(TRUE), not null
 #  manufacturer        :string(255)
 #  origin              :string(255)
 #  shared_updated_on   :datetime
-#  price               :decimal(8, 2)
+#  price               :decimal(, )
 #  tax                 :float
-#  deposit             :decimal(8, 2)   default(0.0)
-#  unit_quantity       :integer(4)      default(1), not null
+#  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)
-#  quantity            :integer(4)      default(0)
 #
 
 require 'test_helper'

test/unit/stock_change_test.rb

@@ -2,13 +2,13 @@
 #
 # 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)
+#  id               :integer         not null, primary key
+#  delivery_id      :integer
+#  order_id         :integer
+#  stock_article_id :integer
+#  quantity         :integer         default(0)
 #  created_at       :datetime
-#  stock_taking_id  :integer(4)
+#  stock_taking_id  :integer
 #
 
 require 'test_helper'

test/unit/stock_taking_test.rb

@@ -2,7 +2,7 @@
 #
 # Table name: stock_takings
 #
-#  id         :integer(4)      not null, primary key
+#  id         :integer         not null, primary key
 #  date       :date
 #  note       :text
 #  created_at :datetime

test/unit/supplier_test.rb

@@ -2,7 +2,7 @@
 #
 # Table name: suppliers
 #
-#  id                 :integer(4)      not null, primary key
+#  id                 :integer         not null, primary key
 #  name               :string(255)     default(""), not null
 #  address            :string(255)     default(""), not null
 #  phone              :string(255)     default(""), not null
@@ -15,7 +15,7 @@
 #  delivery_days      :string(255)
 #  order_howto        :string(255)
 #  note               :string(255)
-#  shared_supplier_id :integer(4)
+#  shared_supplier_id :integer
 #  min_order_quantity :string(255)
 #  deleted_at         :datetime
 #

test/unit/task_test.rb

@@ -2,16 +2,16 @@
 #
 # Table name: tasks
 #
-#  id             :integer(4)      not null, primary key
+#  id             :integer         not null, primary key
 #  name           :string(255)     default(""), not null
 #  description    :string(255)
 #  due_date       :date
-#  done           :boolean(1)
-#  workgroup_id   :integer(4)
-#  assigned       :boolean(1)
+#  done           :boolean
+#  workgroup_id   :integer
+#  assigned       :boolean
 #  created_on     :datetime        not null
 #  updated_on     :datetime        not null
-#  required_users :integer(4)      default(1)
+#  required_users :integer         default(1)
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

test/unit/user_test.rb

@@ -2,7 +2,7 @@
 #
 # Table name: users
 #
-#  id                     :integer(4)      not null, primary key
+#  id                     :integer         not null, primary key
 #  nick                   :string(255)     default(""), not null
 #  password_hash          :string(255)     default(""), not null
 #  password_salt          :string(255)     default(""), not null

test/unit/workgroup_test.rb

@@ -2,28 +2,27 @@
 #
 # Table name: groups
 #
-#  id                  :integer(4)      not null, primary key
+#  id                  :integer         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_balance     :decimal(, )     default(0.0), not null
 #  account_updated     :datetime
 #  created_on          :datetime        not null
-#  role_admin          :boolean(1)      not null
-#  role_suppliers      :boolean(1)      not null
-#  role_article_meta   :boolean(1)      not null
-#  role_finance        :boolean(1)      not null
-#  role_orders         :boolean(1)      not null
-#  weekly_task         :boolean(1)
-#  weekday             :integer(4)
+#  role_admin          :boolean         not null
+#  role_suppliers      :boolean         not null
+#  role_article_meta   :boolean         not null
+#  role_finance        :boolean         not null
+#  role_orders         :boolean         not null
+#  weekly_task         :boolean
+#  weekday             :integer
 #  task_name           :string(255)
 #  task_description    :string(255)
-#  task_required_users :integer(4)      default(1)
+#  task_required_users :integer         default(1)
 #  deleted_at          :datetime
 #  contact_person      :string(255)
 #  contact_phone       :string(255)
 #  contact_address     :string(255)
-#  stats               :text
 #
 
 require 'test_helper'