From 278d7035af2de3151754a50aa535c17051edd793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Wed, 19 Nov 2014 11:29:21 +0100
Subject: [PATCH 01/34] Revert "Revert "Fix contextual_link_to and
 contextual_links_for calls.""

This reverts commit 99f9bf59bfbc79a217337ae7b2ebf6a9ba8ba0e6.
---
 app/views/invoices/show.html.haml    | 2 +-
 app/views/treatments/index.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/invoices/show.html.haml b/app/views/invoices/show.html.haml
index 9dbcfe0f..5f8168b6 100644
--- a/app/views/invoices/show.html.haml
+++ b/app/views/invoices/show.html.haml
@@ -1,6 +1,6 @@
 .contextual
   = icon_link_to t_title(:show, Patient), resource.patient, :icon => :show
-  = contextual_link_to :print, nil, :method => :post, :remote => true
+  = contextual_link_to :print, { :method => :post, :remote => true }
 
 = render 'show'
 
diff --git a/app/views/treatments/index.html.haml b/app/views/treatments/index.html.haml
index 4c8bb0aa..110c6a26 100644
--- a/app/views/treatments/index.html.haml
+++ b/app/views/treatments/index.html.haml
@@ -1,5 +1,5 @@
 .contextual
-  = contextual_links_for :index
+  = contextual_links_for :action => :index
   = icon_link_to t_title(:new, InvoiceBatchJob), new_invoice_batch_job_path
 
 = boot_page_title

From 3246d9d5d95800648a9fab98ef2fdd66fbcbdeed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 23 Feb 2015 23:35:32 +0100
Subject: [PATCH 02/34] Drop currency formatting in insurance recipe as it
 broke on amounts > 1000.

---
 app/prawn/insurance_recipe.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/prawn/insurance_recipe.rb b/app/prawn/insurance_recipe.rb
index 0910c92b..9d2415ed 100644
--- a/app/prawn/insurance_recipe.rb
+++ b/app/prawn/insurance_recipe.rb
@@ -201,13 +201,13 @@ def tarmed_footer(invoice)
       [
         "▪ " + I18n::translate(:pfl, :scope => "activerecord.attributes.invoice"),
         I18n::translate(:tarmed_al, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value_mt("001")),
+        invoice.amount_mt("001").currency_round,
         tax_points_mt(invoice, "001"),
         I18n::translate(:physio, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value("311")),
+        invoice.amount("311").currency_round,
         tax_points(invoice, "311"),
         I18n::translate(:mi_gel, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value("452")),
+        invoice.amount("452").currency_round,
         tax_points(invoice, "452"),
         I18n::translate(:others, :scope => "activerecord.attributes.invoice"),
         "0.00",
@@ -216,13 +216,13 @@ def tarmed_footer(invoice)
       [
         '',
         I18n::translate(:tarmed_tl, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value_tt("001")),
+        invoice.amount_tt("001").currency_round,
         tax_points_tt(invoice, "001"),
         I18n::translate(:laboratory, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value(["316", "317"])),
+        invoice.amount(["316", "317"]).currency_round,
         tax_points(invoice, ["316", "317"]),
         I18n::translate(:medi, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.value("400")),
+        invoice.amount("400").currency_round,
         tax_points(invoice, "400"),
         I18n::translate(:cantonal, :scope => "activerecord.attributes.invoice"),
         "0.00",
@@ -230,16 +230,16 @@ def tarmed_footer(invoice)
       ],
       [
         {:content => "▪ " + I18n::translate(:total_amount, :scope => "activerecord.attributes.invoice"), :colspan => 2},
-        currency_fmt(invoice.amount.currency_round),
+        invoice.amount.currency_round,
         '',
         I18n::translate(:amount_pfl, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.obligation_amount.currency_round),
+        invoice.obligation_amount.currency_round,
         '',
         I18n::translate(:prepayment, :scope => "activerecord.attributes.invoice"),
         "0.00",
         '',
         I18n::translate(:amount_due, :scope => "activerecord.attributes.invoice"),
-        currency_fmt(invoice.amount.currency_round),
+        invoice.amount.currency_round,
         ''
       ]
     ]
@@ -312,7 +312,7 @@ def sub_total(records)
       temp_cursor = cursor
       text_box "Zwischentotal", :style => :bold, :at => [0, temp_cursor]
       text_box "CHF", :at => [RECORD_INDENT, temp_cursor], :style => :bold
-      text_box "#{currency_fmt(records.sum(&:amount).currency_round)}", :width => 5.cm,
+      text_box "#{records.sum(&:amount).currency_round}", :width => 5.cm,
                                            :at => [bounds.width - 5.cm, temp_cursor],
                                            :align => :right,
                                            :style => :bold
@@ -345,7 +345,7 @@ def service_entry(record)
           1,
           0,
           0,
-          currency_fmt(record.amount)
+          record.amount
         ]
 
         table [data], :cell_style => {:overflow => :shrink_to_fit} do
@@ -453,7 +453,7 @@ def summary(invoice)
       [
         "0",
         "0.00",
-        currency_fmt(invoice.amount.currency_round),
+        invoice.amount.currency_round,
         "0.00"
       ]
     ]
@@ -462,7 +462,7 @@ def summary(invoice)
       [
         I18n::translate(:total, :scope => "activerecord.attributes.invoice"),
         '',
-        currency_fmt(invoice.amount.currency_round),
+        invoice.amount.currency_round,
         "0.00"
       ]
     ]

From 8b80d4b075ed1ff1b0f77771c0132d5d2dd438e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 23 Feb 2015 23:36:30 +0100
Subject: [PATCH 03/34] Update CHANGELOG.

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cefd284f..c08e37f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+2.0.0 (unreleased)
+=====
+
+Fixes:
+* Drop currency formatting in insurance recipe as it broke on amounts > 1000.
+
 2.0.0.rc8
 =========
 Some gems got updated, mainly Rails. The installation instructions

From b6ec2bf046977834f9f36d10c19784ef4bed7916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 23 Feb 2015 23:49:15 +0100
Subject: [PATCH 04/34] Add role translations from Hozr.

---
 config/locales/cydoc.de-CH.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/cydoc.de-CH.yml b/config/locales/cydoc.de-CH.yml
index 80996ecf..cc036819 100644
--- a/config/locales/cydoc.de-CH.yml
+++ b/config/locales/cydoc.de-CH.yml
@@ -534,7 +534,10 @@ de-CH:
       admin:    Administrator
       sysadmin: System Administration
       employee:   Mitarbeiter
+      zyto:     Zytologie
       doctor:   Arzt
+      client:   Zuweisender Arzt
+
   flash:
     action:
       dunning_stop:     Mahnstopp gesetzt

From 243973e518b78233e705a8c2581166309ffdd422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 24 Feb 2015 00:12:15 +0100
Subject: [PATCH 05/34] Restrict access to bookkeeping controller actions.

---
 app/controllers/bookkeeping_controller.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/bookkeeping_controller.rb b/app/controllers/bookkeeping_controller.rb
index c429f1be..b1e3a29e 100644
--- a/app/controllers/bookkeeping_controller.rb
+++ b/app/controllers/bookkeeping_controller.rb
@@ -1,7 +1,13 @@
 # -*- encoding : utf-8 -*-
-class BookkeepingController < ApplicationController
+class BookkeepingController < AuthorizedController
+  skip_load_and_authorize_resource
+
   before_filter :set_value_period
 
+  def index
+    authorize! :read, Account
+  end
+
   def set_value_period
     if by_value_period = params[:by_value_period]
       @value_date_begin = by_value_period[:from]
@@ -14,6 +20,8 @@ def set_value_period
   end
 
   def report
+    authorize! :read, Account
+
     @total_invoiced    = Account.find_by_code(current_tenant.settings['invoices.profit_account_code']).saldo(@value_date_range)
     @total_paid        = Account.find_by_code('1000').saldo(@value_date_range) + Account.find_by_code('1020').saldo(@value_date_range)
     @open_items        = Account.find_by_code(current_tenant.settings['invoices.balance_account_code']).saldo(@value_date_end)
@@ -24,6 +32,8 @@ def report
   end
 
   def open_invoices
+    authorize! :read, Account
+
     debit_account_id = Account.find_by_code(current_tenant.settings['invoices.balance_account_code']).id
     @invoices = Invoice
       .joins(:bookings)
@@ -34,6 +44,8 @@ def open_invoices
   end
 
   def open_invoices_csv
+    authorize! :read, Account
+
     debit_account_id = Account.find_by_code(current_tenant.settings['invoices.balance_account_code']).id
     @invoices = Invoice.all(
       :select => "invoices.*, sum(IF(bookings.debit_account_id = #{debit_account_id}, -bookings.amount, bookings.amount)) AS current_due_amount",

From 400b4fbef2556a4721d0a4f24fd1da1895c7ab10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 24 Feb 2015 00:12:48 +0100
Subject: [PATCH 06/34] Update CHANGELOG.

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c08e37f9..dd6fa86a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
 
 Fixes:
 * Drop currency formatting in insurance recipe as it broke on amounts > 1000.
+* Add role translations from Hozr.
+* Restrict access to bookkeeping controller actions.
+
 
 2.0.0.rc8
 =========

From e68e96e8084f8387647176995f6803ca267ba75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Thu, 5 Mar 2015 17:07:59 +0100
Subject: [PATCH 07/34] Update CHANGELOG for the 2.0.0 release.

---
 CHANGELOG | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dd6fa86a..3e0f91fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,23 @@
 2.0.0 (unreleased)
 =====
+This is a major release of CyDoc. It has a fresh look, better Tarmed support and
+lots of small fixes.
 
-Fixes:
+We now provide more settings in the user interface, remote printing among them.
+There is now a much better patient search and forms have been improved.
+
+We actualy rewrote most parts. Mainly porting to Rails 3, switching UI to be
+built on Twitter Bootstrap, and providing fulltext search for patients
+and more.
+
+CyDoc also uses more common code with other projects like Bookyt and Hozr
+by using factored out code.
+
+Fixes since RC8:
 * Drop currency formatting in insurance recipe as it broke on amounts > 1000.
 * Add role translations from Hozr.
 * Restrict access to bookkeeping controller actions.
 
-
 2.0.0.rc8
 =========
 Some gems got updated, mainly Rails. The installation instructions

From cad7f8347cb0f1d76bf42c3d52ab0c9cf2833544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 10 Mar 2015 23:11:13 +0100
Subject: [PATCH 08/34] Rename agpl license file to LICENSE.

This is to support the very cool github license API:
https://developer.github.com/v3/licenses/
---
 agpl-3.0.txt => LICENSE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename agpl-3.0.txt => LICENSE (100%)

diff --git a/agpl-3.0.txt b/LICENSE
similarity index 100%
rename from agpl-3.0.txt
rename to LICENSE

From a40df7f3ac6d1c625b0f6bb2081105d3aa3813c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 29 Dec 2014 09:48:39 +0100
Subject: [PATCH 09/34] Drop unused inherited_resources_views gem.

---
 Gemfile      | 3 ---
 Gemfile.lock | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9231d314..b73f1552 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,9 +97,6 @@ gem 'use_db'
 gem 'in_place_editing'
 gem 'select2-rails'
 
-# CRUD helpers
-gem 'inherited_resources_views'
-
 # Authentication
 gem 'devise'
 gem 'cancan'
diff --git a/Gemfile.lock b/Gemfile.lock
index fec788a7..76b1f867 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,8 +135,6 @@ GEM
     inherited_resources (1.4.0)
       has_scope (~> 0.5.0)
       responders (~> 0.9)
-    inherited_resources_views (0.4.1)
-      inherited_resources (>= 1.0)
     journey (1.0.4)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
@@ -317,7 +315,6 @@ DEPENDENCIES
   i18n_rails_helpers
   in_place_editing
   inherited_resources
-  inherited_resources_views
   jquery-rails
   kaminari
   ledermann-rails-settings

From 493707a81725c24070bd1592d903f29583d67986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 14:53:16 +0100
Subject: [PATCH 10/34] Drop zeus config.

---
 custom_plan.rb | 11 -----------
 zeus.json      | 19 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 custom_plan.rb
 delete mode 100644 zeus.json

diff --git a/custom_plan.rb b/custom_plan.rb
deleted file mode 100644
index 33255640..00000000
--- a/custom_plan.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'zeus/rails'
-
-class CustomPlan < Zeus::Rails
-
-  # def my_custom_command
-  #  # see https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
-  # end
-
-end
-
-Zeus.plan = CustomPlan.new
diff --git a/zeus.json b/zeus.json
deleted file mode 100644
index 4425d49e..00000000
--- a/zeus.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "command": "ruby -rubygems -r./custom_plan -eZeus.go",
-
-  "plan": {
-    "boot": {
-      "default_bundle": {
-        "development_environment": {
-          "prerake": {"rake": []},
-          "console": ["c"],
-          "server": ["s"],
-          "generate": ["g"]
-        },
-        "test_environment": {
-          "test_helper": {"test": ["rspec"]}
-        }
-      }
-    }
-  }
-}

From bbef6d0634d0b4a7dff361e5f4da95aca3edb405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 14:54:25 +0100
Subject: [PATCH 11/34] Drop cucumber specs.

---
 Gemfile                                    |   4 -
 Gemfile.lock                               |   9 -
 features/manage_patients.feature           |  21 ---
 features/step_definitions/cydoc_steps.rb   |  33 ----
 features/step_definitions/patient_steps.rb |  31 ----
 features/step_definitions/webrat_steps.rb  | 100 -----------
 features/step_definitions/welcome_steps.rb |  34 ----
 features/support/env.rb                    |  17 --
 features/support/helper.rb                 |  44 -----
 features/support/paths.rb                  |  13 --
 features/welcome.feature                   |  15 --
 stories/rest_auth_stories.rb               |  23 ---
 stories/rest_auth_stories_helper.rb        |  82 ----------
 stories/steps/ra_navigation_steps.rb       |  50 ------
 stories/steps/ra_resource_steps.rb         | 180 --------------------
 stories/steps/ra_response_steps.rb         | 172 -------------------
 stories/steps/user_steps.rb                | 154 -----------------
 stories/users/accounts.story               | 182 ---------------------
 stories/users/sessions.story               | 134 ---------------
 19 files changed, 1298 deletions(-)
 delete mode 100644 features/manage_patients.feature
 delete mode 100644 features/step_definitions/cydoc_steps.rb
 delete mode 100644 features/step_definitions/patient_steps.rb
 delete mode 100644 features/step_definitions/webrat_steps.rb
 delete mode 100644 features/step_definitions/welcome_steps.rb
 delete mode 100644 features/support/env.rb
 delete mode 100644 features/support/helper.rb
 delete mode 100644 features/support/paths.rb
 delete mode 100644 features/welcome.feature
 delete mode 100644 stories/rest_auth_stories.rb
 delete mode 100644 stories/rest_auth_stories_helper.rb
 delete mode 100644 stories/steps/ra_navigation_steps.rb
 delete mode 100644 stories/steps/ra_resource_steps.rb
 delete mode 100644 stories/steps/ra_response_steps.rb
 delete mode 100644 stories/steps/user_steps.rb
 delete mode 100644 stories/users/accounts.story
 delete mode 100644 stories/users/sessions.story

diff --git a/Gemfile b/Gemfile
index b73f1552..0ffe7655 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,10 +34,6 @@ end
 
 # Test
 # ====
-group :test do
-  gem 'cucumber'
-end
-
 group :test, :development do
   # Console
   gem 'pry-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 76b1f867..79e49e4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,11 +77,6 @@ GEM
     commonjs (0.2.6)
     csv-mapper (0.5.1)
       fastercsv
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
     cupsffi (0.1.1)
     debugger (1.6.5)
       columnize (>= 0.3.1)
@@ -94,7 +89,6 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -102,8 +96,6 @@ GEM
     ffi (1.9.3)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
     haml (4.0.4)
       tilt
     has_accounts (1.1.1)
@@ -301,7 +293,6 @@ DEPENDENCIES
   carrierwave
   coffee-rails
   csv-mapper
-  cucumber
   cupsffi
   devise
   fastercsv
diff --git a/features/manage_patients.feature b/features/manage_patients.feature
deleted file mode 100644
index ac814586..00000000
--- a/features/manage_patients.feature
+++ /dev/null
@@ -1,21 +0,0 @@
-Feature: Manage patients
-  In order to keep the patient list up to date,
-  the doctor wants to be able to add, mutate and
-  delete patient information.
-  
-  Scenario: Search for a patient
-    Given a doctor is logged in as "test"
-    And   I am on the new patient page
-    Then  I should see a <form> containing a textfield: Suche
-    When  I fill in "Suche" with "us_patient"
-
-  Scenario: Lookup patient information
-    Given a doctor is logged in as "test"
-    And   the following patients:
-      |name|sex|birth_date|doctor|
-      |name 1|1|1999-02-03|test|
-      |name 2|1|1900-01-06|test|
-      |name 3|0|2001-04-07|test|
-      |name 4|0|1899-12-31|test|
-#    When  I am on the info page for patient "name 1"
-#    Then  I should see "name 1"
diff --git a/features/step_definitions/cydoc_steps.rb b/features/step_definitions/cydoc_steps.rb
deleted file mode 100644
index addf74f5..00000000
--- a/features/step_definitions/cydoc_steps.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- encoding : utf-8 -*-
-Given /^a user "(.*)" with password "(.*)"$/ do |user, password|
-  User.destroy_all(:login => user)
-  @new_user = User.create!(:login => user, :email => "#{user}@example.com", :password => password, :password_confirmation => password )
-  @new_user.register!
-  @new_user.activate!
-end
-
-Given /^a doctor "(.*)" belonging to office "(.*)"/ do |doctor, office|
-  Given "a user \"#{doctor}\" with password \"monkey\""
-
-  # Doctor
-  Doctor.destroy_all(:login => doctor)
-  doctor = Doctor.create!(:login => doctor)
-
-  # Office
-  Office.destroy_all(:login => office)
-  office = Office.create!(:login => office)
-
-  doctor.offices << office
-  doctor.save!
-end
-
-Given /^a doctor is logged in as "(.*)"$/ do |login|
-  Given "a doctor \"#{login}\" belonging to office \"#{login}\""
-
-  # Login
-  visit "/login" 
-  fill_in("login", :with => login) 
-  fill_in("password", :with => 'monkey') 
-  click_button("Anmelden")
-  response.body.should =~ /Angemeldet als/m
-end
diff --git a/features/step_definitions/patient_steps.rb b/features/step_definitions/patient_steps.rb
deleted file mode 100644
index d0e43ebf..00000000
--- a/features/step_definitions/patient_steps.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- encoding : utf-8 -*-
-Given /I am on the new patient page/ do
-  visit "/patients/new"
-end
-
-When /I am on the info page for patient "(.*)"/ do |name|
-  visit patient_url(Patient.find_by_name(name))
-end
-
-Given /^the following patients:$/ do |patients|
-  @patients = patients.hashes
-  @patients.map!{|patient| patient["doctor"] =  Doctor.find_by_login(patient["doctor"]); patient}
-  Patient.create!(@patients)
-end
-
-When /^I delete the (\d+)(?:st|nd|rd|th) patient$/ do |pos|
-  visit patients_url
-  within("table > tr:nth-child(#{pos.to_i+1})") do
-    click_link "Destroy"
-  end
-end
-
-Then /^I should see the following patients:$/ do |patients|
-  patients.raw[1..-1].each_with_index do |row, i|
-    row.each_with_index do |cell, j|
-      response.should have_selector("table > tr:nth-child(#{i+2}) > td:nth-child(#{j+1})") { |td|
-        td.inner_text.should == cell
-      }
-    end
-  end
-end
diff --git a/features/step_definitions/webrat_steps.rb b/features/step_definitions/webrat_steps.rb
deleted file mode 100644
index 5b5b13d7..00000000
--- a/features/step_definitions/webrat_steps.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-# Commonly used webrat steps
-# http://github.com/brynary/webrat
-
-When /^I go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^I press "(.*)"$/ do |button|
-  click_button(button)
-end
-
-When /^I follow "(.*)"$/ do |link|
-  click_link(link)
-end
-
-When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
-  fill_in(field, :with => value) 
-end
-
-When /^I select "(.*)" from "(.*)"$/ do |value, field|
-  select(value, :from => field) 
-end
-
-# Use this step in conjunction with Rail's datetime_select helper. For example:
-# When I select "December 25, 2008 10:00" as the date and time 
-When /^I select "(.*)" as the date and time$/ do |time|
-  select_datetime(time)
-end
-
-# Use this step when using multiple datetime_select helpers on a page or 
-# you want to specify which datetime to select. Given the following view:
-#   <%= f.label :preferred %><br />
-#   <%= f.datetime_select :preferred %>
-#   <%= f.label :alternative %><br />
-#   <%= f.datetime_select :alternative %>
-# The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" data and time
-# And I select "November 25, 2004 10:30" as the "Alternative" data and time
-When /^I select "(.*)" as the "(.*)" date and time$/ do |datetime, datetime_label|
-  select_datetime(datetime, :from => datetime_label)
-end
-
-# Use this step in conjuction with Rail's time_select helper. For example:
-# When I select "2:20PM" as the time
-# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it. 
-When /^I select "(.*)" as the time$/ do |time|
-  select_time(time)
-end
-
-# Use this step when using multiple time_select helpers on a page or you want to
-# specify the name of the time on the form.  For example:
-# When I select "7:30AM" as the "Gym" time
-When /^I select "(.*)" as the "(.*)" time$/ do |time, time_label|
-  select_time(time, :from => time_label)
-end
-
-# Use this step in conjuction with Rail's date_select helper.  For example:
-# When I select "February 20, 1981" as the date
-When /^I select "(.*)" as the date$/ do |date|
-  select_date(date)
-end
-
-# Use this step when using multiple date_select helpers on one page or
-# you want to specify the name of the date on the form. For example:
-# When I select "April 26, 1982" as the "Date of Birth" date
-When /^I select "(.*)" as the "(.*)" date$/ do |date, date_label|
-  select_date(date, :from => date_label)
-end
-
-When /^I check "(.*)"$/ do |field|
-  check(field) 
-end
-
-When /^I uncheck "(.*)"$/ do |field|
-  uncheck(field) 
-end
-
-When /^I choose "(.*)"$/ do |field|
-  choose(field)
-end
-
-When /^I attach the file at "(.*)" to "(.*)" $/ do |path, field|
-  attach_file(field, path)
-end
-
-Then /^I should see "(.*)"$/ do |text|
-  response.body.should =~ /#{text}/m
-end
-
-Then /^I should not see "(.*)"$/ do |text|
-  response.body.should_not =~ /#{text}/m
-end
-
-Then /^the "(.*)" checkbox should be checked$/ do |label|
-  field_labeled(label).should be_checked
-end
diff --git a/features/step_definitions/welcome_steps.rb b/features/step_definitions/welcome_steps.rb
deleted file mode 100644
index 64bed326..00000000
--- a/features/step_definitions/welcome_steps.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- encoding : utf-8 -*-
-Given "an anonymous user" do
-  get '/sessions/destroy'
-  response.should redirect_to('/session/new')
-  follow_redirect!
-end
-
-Then /^I should see the following sections:$/ do |welcomes|
-  welcomes.raw[1..-1].each_with_index do |row, i|
-    row.each_with_index do |cell, j|
-      response.should have_selector("h3") { |td|
-        td.inner_text.should == cell
-      }
-    end
-  end
-end
-
-# restful_authentication
-# ======================
-# Shameless copy
-# please note: this enforces the use of a <label> field
-Then "$actor should see a <$container> containing a $attributes" do |_, container, attributes|
-  attributes = attributes.to_hash_from_story
-  response.should have_tag(container) do
-    attributes.each do |tag, label|
-      case tag
-      when "textfield" then with_tag "input[type='text']";     with_tag("label", label)
-      when "password"  then with_tag "input[type='password']"; with_tag("label", label)
-      when "submit"    then with_tag "input[type='submit'][value='#{label}']"
-      else with_tag tag, label
-      end
-    end
-  end
-end
diff --git a/features/support/env.rb b/features/support/env.rb
deleted file mode 100644
index 7ff5ab6b..00000000
--- a/features/support/env.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- encoding : utf-8 -*-
-# Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-require 'cucumber/rails/world'
-require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support
-Cucumber::Rails.use_transactional_fixtures
-
-require 'webrat'
-
-Webrat.configure do |config|
-  config.mode = :rails
-end
-
-# Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
-require 'cucumber/rails/rspec'
-require 'webrat/rspec-rails'
diff --git a/features/support/helper.rb b/features/support/helper.rb
deleted file mode 100644
index aa42540f..00000000
--- a/features/support/helper.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- encoding : utf-8 -*-
-#
-# Sugar for turning a story's attribute list into list, array, etc.
-#
-module ToFooFromStory
-  def ToFooFromStory.fix_key key
-    key.downcase.gsub(/\s+/, '_')
-  end
-  def ToFooFromStory.fix_value value
-    return '' if !value
-    value.strip!
-    case 
-    when value =~ /^'(.*)'$/    then value = $1
-    when value =~ /^"(.*)"$/    then value = $1
-    when value == 'nil!'        then value = nil
-    when value == 'non-nil!'    then value = be_nil
-    when value =~ /^#\{(.*)\}$/ then value = eval($1)
-    end
-    value
-  end
-  # Converts a key: value list found in the steps into a hash.  
-  # Example:
-  #   ISBN: '0967539854' and comment: 'I love this book' and Quality rating: '4'
-  #   # => {"quality_rating"=>"4", "isbn"=>"0967539854", "comment"=>"I love this book"}
-  def to_hash_from_story
-    hsh = self.split(/,? and |, /).inject({}) do |hash_so_far, key_value|
-      key, value = key_value.split(":")
-      if !value then warn "Couldn't understand story '#{self}': only understood up to the part '#{hash_so_far.to_yaml}'" end
-      hash_so_far.merge(ToFooFromStory::fix_key(key) => ToFooFromStory::fix_value(value))
-    end
-  end
-  # Coverts an attribute list found in the steps into an array
-  # Example:
-  #   login, email, updated_at, and gravatar
-  #   # => ['login', 'email', 'updated_at', 'gravatar']
-  def to_array_from_story
-    self.split(/,? and |, /).map do |value|
-      ToFooFromStory::fix_value(value)
-    end
-  end
-end
-class String
-  include ToFooFromStory        
-end
diff --git a/features/support/paths.rb b/features/support/paths.rb
deleted file mode 100644
index 65d37399..00000000
--- a/features/support/paths.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- encoding : utf-8 -*-
-def path_to(page_name)
-  case page_name
-  
-  when /the homepage/i
-    root_path
-  
-  # Add more page name => path mappings here
-  
-  else
-    raise "Can't find mapping from \"#{page_name}\" to a path."
-  end
-end
diff --git a/features/welcome.feature b/features/welcome.feature
deleted file mode 100644
index 1666799a..00000000
--- a/features/welcome.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-Feature: Manage welcomes
-  In order to give the client some hints where to go,
-  we provide an overview page.
-  
-  Scenario: A logged out user requests the homepage
-    Given a doctor "test" belonging to office "test office"
-    And an anonymous user
-    When  I go to the homepage
-    Then  I should see "Anmelden"
-    And   I should see a <form> containing a textfield: Login, password: Passwort, and submit: 'Anmelden'
-    Then  I fill in "login" with "test"
-    Then  I fill in "password" with "monkey"
-    Then  I press "Anmelden"
-    And   I should see "Rechnungen anzeigen"
-    
diff --git a/stories/rest_auth_stories.rb b/stories/rest_auth_stories.rb
deleted file mode 100644
index 249f35d2..00000000
--- a/stories/rest_auth_stories.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- encoding : utf-8 -*-
-#!/usr/bin/env ruby
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec/rails/story_adapter'
-require 'spec/story'
-require File.expand_path(File.dirname(__FILE__) + "/rest_auth_stories_helper.rb")
-
-# Make visible for testing
-ApplicationController.send(:public, :logged_in?, :current_user, :authorized?)
-
-this_dir = File.dirname(__FILE__)
-Dir[File.join(this_dir, "steps/*.rb")].each do |file|
-  puts file.to_s
-  require file
-end
-
-with_steps_for :ra_navigation, :ra_response, :ra_resource, :user do
-  story_files = Dir[File.join(this_dir, "users", '*.story')]
-  story_files.each do |file|
-    run file, :type => RailsStory 
-  end
-end
diff --git a/stories/rest_auth_stories_helper.rb b/stories/rest_auth_stories_helper.rb
deleted file mode 100644
index 275ffea1..00000000
--- a/stories/rest_auth_stories_helper.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- encoding : utf-8 -*-
-# If you have a global stories helper, move this line there:
-include AuthenticatedTestHelper
-
-# Most of the below came out of code from Ben Mabey
-# http://www.benmabey.com/2008/02/04/rspec-plain-text-stories-webrat-chunky-bacon/
-
-# These allow exceptions to come through as opposed to being caught and having non-helpful responses returned.
-ActionController::Base.class_eval do
-  def perform_action
-    perform_action_without_rescue
-  end
-end
-Dispatcher.class_eval do
-  def self.failsafe_response(output, status, exception = nil)
-    raise exception
-  end
-end
-
-#
-# Sugar for turning a story's attribute list into list, array, etc.
-#
-module ToFooFromStory
-  def ToFooFromStory.fix_key key
-    key.downcase.gsub(/\s+/, '_')
-  end
-  def ToFooFromStory.fix_value value
-    return '' if !value
-    value.strip!
-    case 
-    when value =~ /^'(.*)'$/    then value = $1
-    when value =~ /^"(.*)"$/    then value = $1
-    when value == 'nil!'        then value = nil
-    when value == 'non-nil!'    then value = be_nil
-    when value =~ /^#\{(.*)\}$/ then value = eval($1)
-    end
-    value
-  end
-  # Converts a key: value list found in the steps into a hash.  
-  # Example:
-  #   ISBN: '0967539854' and comment: 'I love this book' and Quality rating: '4'
-  #   # => {"quality_rating"=>"4", "isbn"=>"0967539854", "comment"=>"I love this book"}
-  def to_hash_from_story
-    hsh = self.split(/,? and |, /).inject({}) do |hash_so_far, key_value|
-      key, value = key_value.split(":")
-      if !value then warn "Couldn't understand story '#{self}': only understood up to the part '#{hash_so_far.to_yaml}'" end
-      hash_so_far.merge(ToFooFromStory::fix_key(key) => ToFooFromStory::fix_value(value))
-    end
-  end
-  # Coverts an attribute list found in the steps into an array
-  # Example:
-  #   login, email, updated_at, and gravatar
-  #   # => ['login', 'email', 'updated_at', 'gravatar']
-  def to_array_from_story
-    self.split(/,? and |, /).map do |value|
-      ToFooFromStory::fix_value(value)
-    end
-  end
-end
-class String
-  include ToFooFromStory        
-end
-
-def instantize(string)
-  instance_variable_get("@#{string}")
-end
-
-#
-# Spew response onto screen -- painful but scrolling >> debugger
-#
-def dump_response
-  # note that @request and @template won't to_yaml and that @session includes @cgi
-  response_methods = response.instance_variables         - ['@request', '@template', '@cgi']
-  request_methods  = response.request.instance_variables - ['@session_options_with_string_keys', '@cgi', '@session']
-  response_methods.map!{|attr| attr.gsub(/^@/,'')}.sort!
-  request_methods.map!{ |attr| attr.gsub(/^@/,'')}.sort!
-  puts '', '*' * 75, 
-    response.instance_values.slice(*response_methods).to_yaml,
-    "*" * 75, '',
-    response.request.instance_values.slice(*request_methods).to_yaml,
-    "*" * 75, ''  
-end
diff --git a/stories/steps/ra_navigation_steps.rb b/stories/steps/ra_navigation_steps.rb
deleted file mode 100644
index 2476b292..00000000
--- a/stories/steps/ra_navigation_steps.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- encoding : utf-8 -*-
-#
-# Where to go
-#
-steps_for(:ra_navigation) do
-  #
-  # GET
-  # Go to a given page.
-  When "$actor goes to $path" do |actor, path|
-    case path
-    when 'the home page' then get '/'
-    else                      get path
-    end
-  end
-
-  # POST -- Ex:
-  #   When she creates a book with ISBN: '0967539854' and comment: 'I love this book' and rating: '4'
-  #   When she creates a singular session with login: 'reggie' and password: 'i_haxxor_joo'
-  # Since I'm not smrt enough to do it right, explicitly specify singular resources
-  When %r{$actor creates an? $resource with $attributes} do |actor, resource, attributes|
-    attributes = attributes.to_hash_from_story
-    if resource =~ %r{singular ([\w/]+)}
-      resource = $1.downcase.singularize
-      post "/#{resource}", attributes
-    else
-      post "/#{resource.downcase.pluralize}", { resource.downcase.singularize => attributes }
-    end
-  end
-
-  # PUT
-  When %r{$actor asks to update '$resource' with $attributes} do |_, resource, attributes|
-    attributes = attributes.to_hash_from_story
-    put "#{resource}", attributes
-    dump_response
-  end
-
-  # DELETE -- Slap together the POST-form-as-fake-HTTP-DELETE submission
-  When %r{$actor asks to delete '$resource'} do |_, resource|
-    post "/#{resource.downcase.pluralize}", { :_method => :delete }
-    dump_response
-  end
-
-
-  # Redirect --
-  #   Rather than coding in get/get_via_redirect's and past/p_v_r's,
-  #   let's just demand that in the story itself.
-  When "$actor follows that redirect!" do |actor|
-    follow_redirect!
-  end
-end
diff --git a/stories/steps/ra_resource_steps.rb b/stories/steps/ra_resource_steps.rb
deleted file mode 100644
index 07448b9e..00000000
--- a/stories/steps/ra_resource_steps.rb
+++ /dev/null
@@ -1,180 +0,0 @@
-# -*- encoding : utf-8 -*-
-# The flexible code for resource testing came out of code from Ben Mabey
-# http://www.benmabey.com/2008/02/04/rspec-plain-text-stories-webrat-chunky-bacon/
-steps_for(:ra_resource) do
-  #
-  # Construct resources
-  #
-  
-  #
-  # Build a resource as described, store it as an @instance variable. Ex:
-  #   "Given a user with login: 'mojojojo'" 
-  # produces a User instance stored in @user with 'mojojojo' as its login
-  # attribute.
-  #
-  Given "a $resource instance with $attributes" do |resource, attributes|
-    klass, instance, attributes = parse_resource_args resource, attributes
-    instance = klass.new(attributes)
-    instance.save!
-    find_resource(resource, attributes).should_not be_nil
-    keep_instance! resource, instance
-  end
-  
-  #
-  # Stuff attributes into a preexisting @resource
-  #   "And the user has thac0: 3"
-  # takes the earlier-defined @user instance and sets its thac0 to '3'.
-  #
-  Given "the $resource has $attributes" do |resource, attributes|
-    klass, instance, attributes = parse_resource_args resource, attributes
-    attributes.each do |attr, val|
-      instance.send("#{attr}=", val)
-    end
-    instance.save!
-    find_resource(resource, attributes).should_not be_nil
-    keep_instance! resource, instance 
-  end
-  
-  #
-  # Destroy all for this resource
-  #
-  Given "no $resource with $attr: '$val' exists" do |resource, attr, val|
-    klass, instance = parse_resource_args resource
-    klass.destroy_all(attr.to_sym => val)
-    instance = find_resource resource, attr.to_sym => val
-    instance.should be_nil
-    keep_instance! resource, instance
-  end
-
-  #
-  # Then's for resources
-  #
-  
-  # Resource like this DOES exist
-  Then %r{an? $resource with $attributes should exist} do |resource, attributes|
-    instance = find_resource resource, attributes
-    instance.should_not be_nil
-    keep_instance! resource, instance
-  end
-  # Resource like this DOES NOT exist
-  Then %r{no $resource with $attributes should exist} do |resource, attributes|
-    instance = find_resource resource, attributes
-    instance.should be_nil
-  end
-
-  # Resource has attributes with given values
-  Then  "the $resource should have $attributes" do |resource, attributes|
-    klass, instance, attributes = parse_resource_args resource, attributes
-    attributes.each do |attr, val|
-      instance.send(attr).should == val
-    end
-  end
-  # Resource attributes should / should not be nil
-  Then  "the $resource's $attr should be nil" do |resource, attr|
-    klass, instance = parse_resource_args resource
-    instance.send(attr).should be_nil
-  end
-  Then  "the $resource's $attr should not be nil" do |resource, attr|
-    klass, instance = parse_resource_args resource
-    instance.send(attr).should_not be_nil
-  end
-
-  #
-  # Bank each of the @resource's listed attributes for later.
-  #
-  Given "we try hard to remember the $resource's $attributes" do |resource, attributes|
-    attributes = attributes.to_array_from_story
-    attributes.each do |attr|
-      memorize_resource_value resource, attr
-    end
-  end
-  #
-  # Bank each of the @resource's listed attributes for later.
-  #
-  Given "we don't remember anything about the past" do 
-    memorize_forget_all!
-  end
-
-  #
-  # Compare @resource.attr to its earlier-memorized value. 
-  # Specify ' using method_name' (abs, to_s, &c) to coerce before comparing.
-  # For important and mysterious reasons, timestamps want to_i or to_s.
-  #
-  Then %r{the $resource\'s $attribute should stay the same(?: under $func)?} do |resource, attr, func|
-    klass, instance = parse_resource_args resource
-    # Get the values
-    old_value = recall_resource_value(resource, attr)
-    new_value = instance.send(attr)
-    # Transform each value, maybe, using value.func
-    if func then new_value = new_value.send(func); old_value = old_value.send(func) end
-    # Compare
-    old_value.should eql(new_value)
-  end
-
-  #
-  # Look for each for the given attributes in the page's text
-  #
-  Then "page should have the $resource's $attributes" do |resource, attributes|
-    actual_resource = instantize(resource)
-    attributes.split(/, and |, /).each do |attribute|
-      response.should have_text(/#{actual_resource.send(attribute.strip.gsub(" ","_"))}/)
-    end
-  end
-  
-end
-
-#
-# Turn a resource name and a to_hash_from_story string like
-#   "attr: 'value', attr2: 'value2', ... , and attrN: 'valueN'"
-# into 
-#   * klass      -- the class matching that Resource
-#   * instance   -- the possibly-preexisting local instance value @resource
-#   * attributes -- a hash matching the given attribute-list string
-# 
-def parse_resource_args resource, attributes=nil
-  instance   = instantize resource
-  klass      = resource.classify.constantize
-  attributes = attributes.to_hash_from_story if attributes
-  [klass, instance, attributes]
-end
-
-#
-# Given a class name 'resource' and a hash of conditsion, find a model 
-#
-def find_resource resource, conditions
-  klass, instance = parse_resource_args resource
-  conditions = conditions.to_hash_from_story unless (conditions.is_a? Hash)
-  klass.find(:first, :conditions => conditions)
-end
-
-#
-# Simple, brittle, useful: store the given resource's attribute
-# so we can compare it later.
-#
-def memorize_resource_value resource, attr
-  klass, instance = parse_resource_args resource
-  value = instance.send(attr)
-  @_memorized ||= {}
-  @_memorized[resource] ||= {}
-  @_memorized[resource][attr] = value
-  value
-end
-def recall_resource_value resource, attr
-  @_memorized[resource][attr]
-end
-def memorize_forget_all!
-  @_memorized = {}
-end
-
-#
-# Keep the object around in a local instance variable @resource.
-#
-# So, for instance,
-#   klass, instance = parse_resource_args 'user'
-#   instance = klass.new({login => 'me', password => 'monkey', ...})
-#   keep_instance! resource, instance
-# keeps the just-constructed User model in the @user instance variable.
-#
-def keep_instance! resource, object
-  instance_variable_set("@#{resource}", object)
-end
diff --git a/stories/steps/ra_response_steps.rb b/stories/steps/ra_response_steps.rb
deleted file mode 100644
index 94dc6997..00000000
--- a/stories/steps/ra_response_steps.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-# -*- encoding : utf-8 -*-
-#
-# What you should see when you get there
-#
-
-steps_for(:ra_response) do  
-  #
-  # Destinations.  Ex:
-  #   She should be at the new kids page
-  #   Tarkin should be at the destroy alderaan page 
-  #   The visitor should be at the '/lolcats/download' form
-  #   The visitor should be redirected to '/hi/mom'
-  #
-  # It doesn't know anything about actual routes -- it just 
-  # feeds its output to render_template or redirect_to
-  #
-  Then "$actor should be at $path" do |_, path|
-    response.should render_template(grok_path(path))
-  end
-
-  Then "$actor should be redirected to $path" do |_, path|
-    response.should redirect_to(grok_path(path))
-  end  
-
-  Then "the page should look AWESOME" do
-    response.should have_tag('head>title')
-    response.should have_tag('h1')
-    # response.should be_valid_xhtml
-  end
-  
-  #
-  # Tags 
-  #
-  
-  Then "the page should contain '$text'" do |_, text|
-    response.should have_text(/#{text}/)
-  end
-  
-  # please note: this enforces the use of a <label> field
-  Then "$actor should see a <$container> containing a $attributes" do |_, container, attributes|
-    attributes = attributes.to_hash_from_story
-    response.should have_tag(container) do
-      attributes.each do |tag, label|
-        case tag
-        when "textfield" then with_tag "input[type='text']";     with_tag("label", label)
-        when "password"  then with_tag "input[type='password']"; with_tag("label", label)
-        when "submit"    then with_tag "input[type='submit'][value='#{label}']"
-        else with_tag tag, label
-        end
-      end
-    end
-  end
-
-  #
-  # Session, cookie variables
-  #
-  Then "$actor $token cookie should include $attrlist" do |_, token, attrlist|
-    attrlist = attrlist.to_array_from_story
-    cookies.include?(token).should be_true
-    attrlist.each do |val|
-      cookies[token].include?(val).should be_true
-    end
-  end
-  
-  Then "$actor $token cookie should exist but not include $attrlist" do |_, token, attrlist|
-    attrlist = attrlist.to_array_from_story
-    cookies.include?(token).should be_true
-    puts [cookies, attrlist, token].to_yaml
-    attrlist.each do |val|
-      cookies[token].include?(val).should_not be_true
-    end
-  end
-
-  Then "$actor should have $an $token cookie" do |_, _, token|
-    cookies[token].should_not be_blank
-  end
-  Then "$actor should not have $an $token cookie" do |_, _, token|
-    cookies[token].should be_blank
-  end
-
-  Given "$actor has $an cookie jar with $attributes" do |_, _, attributes|
-    attributes = attributes.to_hash_from_story
-    attributes.each do |attr, val|
-      cookies[attr] = val
-    end
-  end
-  Given "$actor session store has no $attrlist" do |_, attrlist|
-    attrlist = attrlist.to_array_from_story
-    attrlist.each do |attr|
-      # Note that the comparison passes through 'to_s'
-      session[attr.to_sym] = nil
-    end
-  end
-  
-  Then "$actor session store should have $attributes" do |_, attributes|
-    attributes = attributes.to_hash_from_story
-    attributes.each do |attr, val|
-      # Note that the comparison passes through 'to_s'
-      session[attr.to_sym].to_s.should eql(val)
-    end
-  end
-  
-  Then "$actor session store should not have $attrlist" do |_, attrlist|
-    attrlist = attrlist.to_array_from_story
-    attrlist.each do |attr|
-      session[attr.to_sym].blank?.should be_true
-    end
-  end
-
-  #
-  # Flash messages
-  #
-  
-  Then "$actor should see $an $notice message '$message'" do |_, _, notice, message|
-    response.should have_flash(notice, %r{#{message}})
-  end
-  
-  Then "$actor should not see $an $notice message '$message'" do |_, _, notice, message|
-    response.should_not have_flash(notice, %r{#{message}})
-  end
-  
-  Then "$actor should see no messages" do |_|
-    ['error', 'warning', 'notice'].each do |notice|
-      response.should_not have_flash(notice)
-    end
-  end
-
-  RE_POLITENESS = /(?:please|sorry|thank(?:s| you))/i
-  Then %r{we should be polite about it} do 
-    response.should have_tag("div.error,div.notice", RE_POLITENESS)
-  end
-  Then %r{we should not even be polite about it} do 
-    response.should_not have_tag("div.error,div.notice", RE_POLITENESS)
-  end
-  
-  #
-  # Resource's attributes
-  # 
-  # "Then page should have the $resource's $attributes" is in resource_steps
-  
-  # helpful debug step
-  Then "we dump the response" do
-    dump_response
-  end  
-end
-
-
-def have_flash notice, *args
-  have_tag("div.#{notice}", *args)
-end
-
-RE_PRETTY_RESOURCE = /the (index|show|new|create|edit|update|destroy) (\w+) (page|form)/i
-RE_THE_FOO_PAGE    = /the '?([^']*)'? (page|form)/i
-RE_QUOTED_PATH     = /^'([^']*)'$/i
-def grok_path path
-  path.gsub(/\s+again$/,'') # strip trailing ' again'
-  case
-  when path == 'the home page'    then dest = '/'
-  when path =~ RE_PRETTY_RESOURCE then dest = template_for $1, $2
-  when path =~ RE_THE_FOO_PAGE    then dest = $1
-  when path =~ RE_QUOTED_PATH     then dest = $1
-  else                                 dest = path
-  end
-  dest
-end
-
-# turns 'new', 'road bikes' into 'road_bikes/new'
-# note that it's "action resource"
-def template_for(action, resource)
-  "#{resource.gsub(" ","_")}/#{action}"
-end
-
diff --git a/stories/steps/user_steps.rb b/stories/steps/user_steps.rb
deleted file mode 100644
index 5b1dd6f2..00000000
--- a/stories/steps/user_steps.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../helper'
-
-RE_User      = %r{(?:(?:the )? *(\w+) *)}
-RE_User_TYPE = %r{(?: *(\w+)? *)}
-steps_for(:user) do
-
-  #
-  # Setting
-  #
-  
-  Given "an anonymous user" do 
-    log_out!
-  end
-
-  Given "$an $user_type user with $attributes" do |_, user_type, attributes|
-    create_user! user_type, attributes.to_hash_from_story
-  end
-  
-  Given "$an $user_type user named '$login'" do |_, user_type, login|
-    create_user! user_type, named_user(login)
-  end
-  
-  Given "$an $user_type user logged in as '$login'" do |_, user_type, login|
-    create_user! user_type, named_user(login)
-    log_in_user!
-  end
-  
-  Given "$actor is logged in" do |_, login|
-    log_in_user! @user_params || named_user(login)
-  end
-  
-  Given "there is no $user_type user named '$login'" do |_, login|
-    @user = User.find_by_login(login)
-    @user.destroy! if @user
-    @user.should be_nil
-  end
-  
-  #
-  # Actions
-  #
-  When "$actor logs out" do 
-    log_out
-  end
-
-  When "$actor registers an account as the preloaded '$login'" do |_, login|
-    user = named_user(login)
-    user['password_confirmation'] = user['password']
-    create_user user
-  end
-
-  When "$actor registers an account with $attributes" do |_, attributes|
-    create_user attributes.to_hash_from_story
-  end
-  
-  When "$actor activates with activation code $attributes" do |_, activation_code|
-    activation_code = '' if activation_code == 'that is blank'
-    activate 
-  end  
-
-  When "$actor logs in with $attributes" do |_, attributes|
-    log_in_user attributes.to_hash_from_story
-  end
-  
-  #
-  # Result
-  #
-  Then "$actor should be invited to sign in" do |_|
-    response.should render_template('/sessions/new')
-  end
-  
-  Then "$actor should not be logged in" do |_|
-    controller.logged_in?.should_not be_true
-  end
-    
-  Then "$login should be logged in" do |login|
-    controller.logged_in?.should be_true
-    controller.current_user.should === @user
-    controller.current_user.login.should == login
-  end
-    
-end
-
-def named_user login
-  user_params = {
-    'admin'   => {'id' => 1, 'login' => 'addie', 'password' => '1234addie', 'email' => 'admin@example.com',       },
-    'oona'    => {          'login' => 'oona',   'password' => '1234oona',  'email' => 'unactivated@example.com'},
-    'reggie'  => {          'login' => 'reggie', 'password' => 'monkey',    'email' => 'registered@example.com' },
-    }
-  user_params[login.downcase]
-end
-
-#
-# User account actions.
-#
-# The ! methods are 'just get the job done'.  It's true, they do some testing of
-# their own -- thus un-DRY'ing tests that do and should live in the user account
-# stories -- but the repetition is ultimately important so that a faulty test setup
-# fails early.  
-#
-
-def log_out 
-  get '/sessions/destroy'
-end
-
-def log_out!
-  log_out
-  response.should redirect_to('/')
-  follow_redirect!
-end
-
-def create_user(user_params={})
-  @user_params       ||= user_params
-  post "/users", :user => user_params
-  @user = User.find_by_login(user_params['login'])
-end
-
-def create_user!(user_type, user_params)
-  user_params['password_confirmation'] ||= user_params['password'] ||= user_params['password']
-  create_user user_params
-  response.should redirect_to('/')
-  follow_redirect!
- 
-  # fix the user's activation status
-  activate_user! if user_type == 'activated'
-end
-
- 
-def activate_user activation_code=nil
-  activation_code = @user.activation_code if activation_code.nil?
-  get "/activate/#{activation_code}"
-end
-
-def activate_user! *args
-  activate_user *args
-  response.should redirect_to('/login')
-  follow_redirect!
-  response.should have_flash("notice", /Signup complete!/)
-end
-
-def log_in_user user_params=nil
-  @user_params ||= user_params
-  user_params  ||= @user_params
-  post "/session", user_params
-  @user = User.find_by_login(user_params['login'])
-  controller.current_user
-end
-
-def log_in_user! *args
-  log_in_user *args
-  response.should redirect_to('/')
-  follow_redirect!
-  response.should have_flash("notice", /Logged in successfully/)
-end
diff --git a/stories/users/accounts.story b/stories/users/accounts.story
deleted file mode 100644
index 91f5d3ee..00000000
--- a/stories/users/accounts.story
+++ /dev/null
@@ -1,182 +0,0 @@
-Visitors should be in control of creating an account and of proving their
-essential humanity/accountability or whatever it is people think the
-id-validation does.  We should be fairly skeptical about this process, as the
-identity+trust chain starts here.
-
-Story: Creating an account
-  As an anonymous user
-  I want to be able to create an account
-  So that I can be one of the cool kids
-
-  #
-  # Account Creation: Get entry form
-  #
-  Scenario: Anonymous user can start creating an account
-    Given an anonymous user
-    When  she goes to /signup
-    Then  she should be at the 'users/new' page
-     And  the page should look AWESOME
-     And  she should see a <form> containing a textfield: Login, textfield: Email, password: Password, password: 'Confirm Password', submit: 'Sign up'
-
-  #
-  # Account Creation
-  #
-  Scenario: Anonymous user can create an account
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account as the preloaded 'Oona'
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Thanks for signing up!'
-     And  a user with login: 'oona' should exist
-     And  the user should have login: 'oona', and email: 'unactivated@example.com'
-
-     And  the user's activation_code should not be nil
-     And  the user's activated_at    should     be nil
-     And  she should not be logged in
-
-
-  #
-  # Account Creation Failure: Account exists
-  #
-
-  Scenario: Anonymous user can not create an account replacing a non-activated account
-    Given an anonymous user
-     And  a registered user named 'Reggie'
-     And  the user has activation_code: 'activate_me', activated_at: nil! 
-     And  we try hard to remember the user's updated_at, and created_at
-    When  she registers an account with login: 'reggie', password: 'monkey', and email: 'different@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Login has already been taken'
-     And  she should not see an errorExplanation message 'Email has already been taken'
-     And  a user with login: 'reggie' should exist
-     And  the user should have email: 'registered@example.com'
-     And  the user's activation_code should not be nil
-     And  the user's activated_at    should     be nil
-     And  the user's created_at should stay the same under to_s
-     And  the user's updated_at should stay the same under to_s
-     And  she should not be logged in
-     
-  Scenario: Anonymous user can not create an account replacing an activated account
-    Given an anonymous user
-     And  an activated user named 'Reggie'
-     And  we try hard to remember the user's updated_at, and created_at
-    When  she registers an account with login: 'reggie', password: 'monkey', and email: 'reggie@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Login has already been taken'
-     And  she should not see an errorExplanation message 'Email has already been taken'
-     And  a user with login: 'reggie' should exist
-     And  the user should have email: 'registered@example.com'
-
-     And  the user's activation_code should     be nil
-     And  the user's activated_at    should not be nil
-     And  the user's created_at should stay the same under to_s
-     And  the user's updated_at should stay the same under to_s
-     And  she should not be logged in
-
-  #
-  # Account Creation Failure: Incomplete input
-  #
-  Scenario: Anonymous user can not create an account with incomplete or incorrect input
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account with login: '',     password: 'monkey', password_confirmation: 'monkey' and email: 'unactivated@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Login can't be blank'
-     And  no user with login: 'oona' should exist
-     
-  Scenario: Anonymous user can not create an account with no password
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account with login: 'oona', password: '',       password_confirmation: 'monkey' and email: 'unactivated@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Password can't be blank'
-     And  no user with login: 'oona' should exist
-     
-  Scenario: Anonymous user can not create an account with no password_confirmation
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account with login: 'oona', password: 'monkey', password_confirmation: ''       and email: 'unactivated@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Password confirmation can't be blank'
-     And  no user with login: 'oona' should exist
-     
-  Scenario: Anonymous user can not create an account with mismatched password & password_confirmation
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account with login: 'oona', password: 'monkey', password_confirmation: 'monkeY' and email: 'unactivated@example.com'
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Password doesn't match confirmation'
-     And  no user with login: 'oona' should exist
-     
-  Scenario: Anonymous user can not create an account with bad email
-    Given an anonymous user
-     And  no user with login: 'Oona' exists
-    When  she registers an account with login: 'oona', password: 'monkey', password_confirmation: 'monkey' and email: ''
-    Then  she should be at the 'users/new' page
-     And  she should     see an errorExplanation message 'Email can't be blank'
-     And  no user with login: 'oona' should exist
-    When  she registers an account with login: 'oona', password: 'monkey', password_confirmation: 'monkey' and email: 'unactivated@example.com'
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Thanks for signing up!'
-     And  a user with login: 'oona' should exist
-     And  the user should have login: 'oona', and email: 'unactivated@example.com'
-
-     And  the user's activation_code should not be nil
-     And  the user's activated_at    should     be nil
-     And  she should not be logged in
-
-     
-
-Story: Activating an account
-  As a registered, but not yet activated, user
-  I want to be able to activate my account
-  So that I can log in to the site
-
-  #
-  # Successful activation
-  #
-  Scenario: Not-yet-activated user can activate her account
-    Given a registered user named 'Reggie'
-     And  the user has activation_code: 'activate_me', activated_at: nil! 
-     And  we try hard to remember the user's updated_at, and created_at
-    When  she goes to /activate/activate_me
-    Then  she should be redirected to 'login'
-    When  she follows that redirect!
-    Then  she should see a notice message 'Signup complete!'
-     And  a user with login: 'reggie' should exist
-     And  the user should have login: 'reggie', and email: 'registered@example.com'
-     And  the user's activation_code should     be nil
-     And  the user's activated_at    should not be nil
-     And  she should not be logged in
-
-  #
-  # Unsuccessful activation
-  #
-  Scenario: Not-yet-activated user can't activate her account with a blank activation code
-    Given a registered user named 'Reggie'
-     And  the user has activation_code: 'activate_me', activated_at: nil! 
-     And  we try hard to remember the user's updated_at, and created_at
-    When  she goes to /activate/
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see an error  message 'activation code was missing'
-     And  a user with login: 'reggie' should exist
-     And  the user should have login: 'reggie', activation_code: 'activate_me', and activated_at: nil!
-     And  the user's updated_at should stay the same under to_s
-     And  she should not be logged in
-  
-  Scenario: Not-yet-activated user can't activate her account with a bogus activation code
-    Given a registered user named 'Reggie'
-     And  the user has activation_code: 'activate_me', activated_at: nil! 
-     And  we try hard to remember the user's updated_at, and created_at
-    When  she goes to /activate/i_haxxor_joo
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see an error  message 'couldn\'t find a user with that activation code'
-     And  a user with login: 'reggie' should exist
-     And  the user should have login: 'reggie', activation_code: 'activate_me', and activated_at: nil!
-     And  the user's updated_at should stay the same under to_s
-     And  she should not be logged in
-
diff --git a/stories/users/sessions.story b/stories/users/sessions.story
deleted file mode 100644
index 5bdba9d3..00000000
--- a/stories/users/sessions.story
+++ /dev/null
@@ -1,134 +0,0 @@
-Users want to know that nobody can masquerade as them.  We want to extend trust
-only to visitors who present the appropriate credentials.  Everyone wants this
-identity verification to be as secure and convenient as possible.
-
-Story: Logging in
-  As an anonymous user with an account
-  I want to log in to my account
-  So that I can be myself
-
-  #
-  # Log in: get form
-  #
-  Scenario: Anonymous user can get a login form.
-    Given an anonymous user
-    When  she goes to /login
-    Then  she should be at the new sessions page
-     And  the page should look AWESOME
-     And  she should see a <form> containing a textfield: Login, password: Password, and submit: 'Log in'
-  
-  #
-  # Log in successfully, but don't remember me
-  #
-  Scenario: Anonymous user can log in
-    Given an anonymous user
-     And  an activated user named 'reggie'
-    When  she creates a singular sessions with login: 'reggie', password: 'monkey', remember me: ''
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Logged in successfully'
-     And  reggie should be logged in
-     And  she should not have an auth_token cookie
-   
-  Scenario: Logged-in user who logs in should be the new one
-    Given an activated user named 'reggie'
-     And  an activated user logged in as 'oona'
-    When  she creates a singular sessions with login: 'reggie', password: 'monkey', remember me: ''
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Logged in successfully'
-     And  reggie should be logged in
-     And  she should not have an auth_token cookie
-  
-  #
-  # Log in successfully, remember me
-  #
-  Scenario: Anonymous user can log in and be remembered
-    Given an anonymous user
-     And  an activated user named 'reggie'
-    When  she creates a singular sessions with login: 'reggie', password: 'monkey', remember me: '1'
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Logged in successfully'
-     And  reggie should be logged in
-     And  she should have an auth_token cookie
-	      # assumes fixtures were run sometime
-     And  her session store should have user_id: 4
-   
-  #
-  # Log in unsuccessfully
-  #
-  
-  Scenario: Logged-in user who fails logs in should be logged out
-    Given an activated user named 'oona'
-    When  she creates a singular sessions with login: 'oona', password: '1234oona', remember me: '1'
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Logged in successfully'
-     And  oona should be logged in
-     And  she should have an auth_token cookie
-    When  she creates a singular sessions with login: 'reggie', password: 'i_haxxor_joo'
-    Then  she should be at the new sessions page
-    Then  she should see an error message 'Couldn't log you in as 'reggie''
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-  
-  Scenario: Log-in with bogus info should fail until it doesn't
-    Given an activated user named 'reggie'
-    When  she creates a singular sessions with login: 'reggie', password: 'i_haxxor_joo'
-    Then  she should be at the new sessions page
-    Then  she should see an error message 'Couldn't log you in as 'reggie''
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-    When  she creates a singular sessions with login: 'reggie', password: ''
-    Then  she should be at the new sessions page
-    Then  she should see an error message 'Couldn't log you in as 'reggie''
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-    When  she creates a singular sessions with login: '', password: 'monkey'
-    Then  she should be at the new sessions page
-    Then  she should see an error message 'Couldn't log you in as '''
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-    When  she creates a singular sessions with login: 'leonard_shelby', password: 'monkey'
-    Then  she should be at the new sessions page
-    Then  she should see an error message 'Couldn't log you in as 'leonard_shelby''
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-    When  she creates a singular sessions with login: 'reggie', password: 'monkey', remember me: '1'
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'Logged in successfully'
-     And  reggie should be logged in
-     And  she should have an auth_token cookie
-	      # assumes fixtures were run sometime
-     And  her session store should have user_id: 4
-
-
-  #
-  # Log out successfully (should always succeed)
-  #
-  Scenario: Anonymous (logged out) user can log out.
-    Given an anonymous user
-    When  she goes to /logout
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'You have been logged out'
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id
-
-  Scenario: Logged in user can log out.
-    Given an activated user logged in as 'reggie'
-    When  she goes to /logout
-    Then  she should be redirected to the home page
-    When  she follows that redirect!
-    Then  she should see a notice message 'You have been logged out'
-     And  she should not be logged in
-     And  she should not have an auth_token cookie
-     And  her session store should not have user_id

From 2c19269bd9fd9c8e999fb3fe5309a90ba5bb7acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 19:11:21 +0100
Subject: [PATCH 12/34] Update gems and compatibility fixes.

---
 Gemfile                                       |  21 +-
 Gemfile.lock                                  | 280 +++++++++---------
 app/assets/javascripts/covercard.js           |   2 +-
 app/assets/javascripts/nested_form.js         |   2 +-
 .../bootstrap_and_overrides.css.less          |  12 +-
 app/models/insurance.rb                       |   1 +
 app/views/invoices/show.html.haml             |   2 +-
 app/views/treatments/index.html.haml          |   2 +-
 config/sphinx.yml                             |   1 +
 9 files changed, 170 insertions(+), 153 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0ffe7655..9dece14f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source 'http://rubygems.org'
 
 # Rails
 # =====
-gem 'rails'
+gem 'rails', '~> 3.2'
 
 # Unicorn
 # =======
@@ -66,20 +66,21 @@ gem 'simple-navigation'
 # CyDoc
 # =====
 # Authentication
-gem 'aasm'
+gem 'aasm', '~> 3.0' # Changed API
 
 # Date/Time handling
 gem 'validates_timeliness'
 
 # Addresses
 gem 'unicode_utils'
-gem 'has_vcards'
+gem 'has_vcards', '~> 0.20' # Data model changes, needs synced release with CyDoc
 gem 'autocompletion'
 gem 'swissmatch'
+gem 'swissmatch-location', :require => 'swissmatch/location/autoload'
 
 # Billing
-gem 'has_accounts'
-gem 'has_accounts_engine'
+gem 'has_accounts', '~> 1.1' # Changed API
+gem 'has_accounts_engine', '~> 1.1' # Changed API
 gem 'acts-as-taggable-on'
 
 # Import
@@ -94,18 +95,18 @@ gem 'in_place_editing'
 gem 'select2-rails'
 
 # Authentication
-gem 'devise'
-gem 'cancan'
+gem 'devise', '~> 2.2' # Changed API
+gem 'cancan', '1.6.8' # Issue with aliases
 gem 'lyb_devise_admin'
 
 # Search
-gem 'thinking-sphinx'
+gem 'thinking-sphinx', '~> 2.0' # Changed API
 
 # Uploads
 gem 'carrierwave'
 
 # PDF
-gem 'prawn', :git => 'https://github.com/prawnpdf/prawn.git'
+gem 'prawn', '1.0.0.rc2' # table support needs porting, group has been dropped
 gem 'prawnto'
 
 
@@ -113,7 +114,7 @@ gem 'prawnto'
 gem 'routing-filter'
 
 # Settings
-gem 'ledermann-rails-settings', :require => 'rails-settings'
+gem 'ledermann-rails-settings', '~> 1.2', :require => 'rails-settings' # Changed API
 
 # ESR support
 gem 'vesr'
diff --git a/Gemfile.lock b/Gemfile.lock
index 79e49e4a..9d53a558 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,22 +1,14 @@
-GIT
-  remote: https://github.com/prawnpdf/prawn.git
-  revision: 2f56ac32f4a2761e727994216d30f24c45733349
-  specs:
-    prawn (1.0.0.rc1)
-      pdf-reader (>= 0.9.0, < 2.0)
-      ttfunk (~> 1.0.3)
-
 GEM
   remote: http://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    aasm (3.0.13)
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
+    aasm (3.4.0)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -24,31 +16,34 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-sqlserver-adapter (3.2.9)
+    activerecord-sqlserver-adapter (3.2.12)
       activerecord (~> 3.2.0)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    acts-as-taggable-on (2.4.1)
-      rails (>= 3, < 5)
+    acts-as-taggable-on (3.4.2)
+      activerecord (>= 3.2, < 5)
+    afm (0.2.2)
     arel (3.0.3)
     autocompletion (0.0.3)
-    bcrypt-ruby (3.0.1)
+    bcrypt (3.1.9)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
     cancan (1.6.8)
     cap-recipes (0.3.39)
-    capistrano (2.14.2)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -57,54 +52,56 @@ GEM
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
     capistrano_colors (0.5.5)
-    capones_recipes (1.18.0)
+    capones_recipes (1.20.1)
       cap-recipes
-      capistrano
+      capistrano (~> 2.0)
       capistrano-ext
       capistrano_colors
-    carrierwave (0.7.0)
+    carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
     coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    columnize (0.3.6)
-    commonjs (0.2.6)
+    coffee-script-source (1.8.0)
+    columnize (0.9.0)
+    commonjs (0.2.7)
     csv-mapper (0.5.1)
       fastercsv
-    cupsffi (0.1.1)
-    debugger (1.6.5)
+    cupsffi (0.1.4)
+      ffi
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
-    devise (2.1.2)
+    debugger-ruby_core_source (1.3.7)
+    devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.2.2)
     fastercsv (1.5.5)
-    ffi (1.9.3)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
-    haml (4.0.4)
+    ffi (1.9.6)
+    formtastic (3.1.2)
+      actionpack (>= 3.2.13)
+    haml (4.0.6)
       tilt
-    has_accounts (1.1.1)
+    has_accounts (1.1.3)
       acts-as-taggable-on
       has_vcards
       inherited_resources
       rails (~> 3.1)
       validates_timeliness
-    has_accounts_engine (1.1.0)
+    has_accounts_engine (1.1.2)
       acts-as-taggable-on
       has_accounts (>= 1.0.2)
       has_vcards
@@ -118,33 +115,34 @@ GEM
       inherited_resources
       rails (~> 3.0)
       simple_form
-    hashery (2.0.1)
-    highline (1.6.15)
+    hashery (2.1.1)
+    highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.11)
-    i18n_rails_helpers (1.3.0)
+    i18n (0.7.0)
+    i18n_rails_helpers (1.4.12)
     in_place_editing (1.2.0)
     inherited_resources (1.4.0)
       has_scope (~> 0.5.0)
       responders (~> 0.9)
+    innertube (1.0.2)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.1)
-    kaminari (0.14.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.7.4)
-    ledermann-rails-settings (1.2.0)
+    kgio (2.9.2)
+    ledermann-rails-settings (1.2.1)
       activerecord (>= 2.3)
-    less (2.2.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.2.6)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    less-rails (2.6.0)
       actionpack (>= 3.1)
-      less (~> 2.2.0)
-    libv8 (3.3.10.4)
-    lyb_devise_admin (0.3.5)
+      less (~> 2.6.0)
+    libv8 (3.16.14.7)
+    lyb_devise_admin (0.3.6)
     lyb_sidebar (0.1.1)
       rails (~> 3.1)
     mail (2.5.4)
@@ -152,35 +150,44 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mini_portile (0.6.2)
     multi_json (1.10.1)
-    mysql2 (0.3.11)
-    net-scp (1.1.0)
+    mysql2 (0.3.17)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
+    net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.5)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.5.6)
-    orm_adapter (0.4.0)
-    pdf-reader (1.2.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    orm_adapter (0.5.0)
+    pdf-reader (1.3.3)
       Ascii85 (~> 1.0.0)
+      afm (~> 0.2.0)
       hashery (~> 2.0)
       ruby-rc4
+      ttfunk
     polyglot (0.3.5)
+    prawn (1.0.0.rc2)
+      afm
+      pdf-reader (>= 0.9.0, < 2.0)
+      ruby-rc4
+      ttfunk (~> 1.0.3)
     prawnto (0.1.1)
       prawn
       rails (>= 2.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
+    pry-debugger (0.2.3)
       debugger (~> 1.3)
-      pry (~> 0.9.10)
-    pry-doc (0.5.1)
-      pry (>= 0.9)
-      yard (>= 0.8)
+      pry (>= 0.9.10, < 0.11.0)
+    pry-doc (0.6.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
     rack (1.4.5)
@@ -190,68 +197,72 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
+      railties (= 3.2.21)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.10.0)
-    rake (10.3.2)
+    raindrops (0.13.0)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    ref (1.0.5)
     responders (0.9.3)
       railties (~> 3.1)
-    riddle (1.5.3)
+    riddle (1.5.11)
     routing-filter (0.3.1)
       actionpack
     ruby-rc4 (0.1.5)
-    rubyzip (0.9.9)
-    sass (3.2.12)
-    select2-rails (3.2.1)
+    rubyzip (1.1.6)
+    sass (3.4.9)
+    select2-rails (3.5.9.1)
       thor (~> 0.14)
-    show_for (0.2.5)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    simple-navigation (3.9.0)
+    show_for (0.3.0)
+      actionpack (>= 3.2, < 5)
+      activemodel (>= 3.2, < 5)
+    simple-navigation (3.13.0)
       activesupport (>= 2.3.2)
-    simple_form (2.1.1)
+    simple_form (2.1.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    slop (3.4.7)
-    sprockets (2.2.2)
+    slop (3.6.0)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    swissmatch (0.0.3)
-      swissmatch-directories
-      swissmatch-location
-      swissmatch-rails
-      swissmatch-street
+    sqlite3 (1.3.10)
+    swissmatch (0.1.1)
+      swissmatch-directories (>= 0.0.1)
+      swissmatch-location (>= 0.1.1)
+      swissmatch-rails (>= 0.0.3)
+      swissmatch-street (>= 0.0.1)
     swissmatch-directories (0.0.1)
       nokogiri (>= 1.5.0)
-    swissmatch-location (0.0.1.201208)
-      autocompletion (>= 0.0.2)
+    swissmatch-location (0.1.2.201409)
+      autocompletion (>= 0.0.3)
       rubyzip
-    swissmatch-rails (0.0.3)
+      unicode
+    swissmatch-rails (0.0.4)
     swissmatch-street (0.0.1)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thinking-sphinx (2.0.13)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thinking-sphinx (2.1.0)
       activerecord (>= 3.0.3)
       builder (>= 2.1.2)
-      riddle (>= 1.5.3)
+      innertube (~> 1.0.2)
+      riddle (>= 1.5.6)
     thor (0.19.1)
     tilt (1.4.1)
     timeliness (0.3.7)
@@ -259,67 +270,69 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     ttfunk (1.0.3)
-    twitter-bootstrap-rails (2.2.0)
+    twitter-bootstrap-rails (2.2.8)
       actionpack (>= 3.1)
       execjs
+      rails (>= 3.1)
       railties (>= 3.1)
-    tzinfo (0.3.41)
-    uglifier (1.3.0)
+    tzinfo (0.3.42)
+    uglifier (2.6.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
+    unicode (0.4.4.2)
     unicode_utils (1.4.0)
-    unicorn (4.3.1)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     use_db (0.2.0)
     validates_timeliness (3.0.14)
       timeliness (~> 0.3.6)
-    vesr (0.13.0)
-    warden (1.2.1)
+    vesr (0.13.1)
+    warden (1.2.3)
       rack (>= 1.0)
-    yard (0.8.7.3)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aasm
+  aasm (~> 3.0)
   activerecord-sqlserver-adapter
   acts-as-taggable-on
   autocompletion
-  cancan
+  cancan (= 1.6.8)
   capones_recipes
   carrierwave
   coffee-rails
   csv-mapper
   cupsffi
-  devise
+  devise (~> 2.2)
   fastercsv
   ffi
   formtastic
   haml
-  has_accounts
-  has_accounts_engine
+  has_accounts (~> 1.1)
+  has_accounts_engine (~> 1.1)
   has_scope
-  has_vcards
+  has_vcards (~> 0.20)
   i18n_rails_helpers
   in_place_editing
   inherited_resources
   jquery-rails
   kaminari
-  ledermann-rails-settings
+  ledermann-rails-settings (~> 1.2)
   less-rails
   lyb_devise_admin
   lyb_sidebar
   mysql2
   nokogiri
-  prawn!
+  prawn (= 1.0.0.rc2)
   prawnto
   pry-debugger
   pry-doc
   pry-rails
-  rails
+  rails (~> 3.2)
   rdoc
   routing-filter
   sass
@@ -329,8 +342,9 @@ DEPENDENCIES
   simple_form
   sqlite3
   swissmatch
+  swissmatch-location
   therubyracer
-  thinking-sphinx
+  thinking-sphinx (~> 2.0)
   twitter-bootstrap-rails
   uglifier
   unicode_utils
diff --git a/app/assets/javascripts/covercard.js b/app/assets/javascripts/covercard.js
index 193071db..add00437 100644
--- a/app/assets/javascripts/covercard.js
+++ b/app/assets/javascripts/covercard.js
@@ -1,5 +1,5 @@
 jQuery(document).ready(function(){
-  jQuery('.reset-updated-attribute').live('click', function(){
+  jQuery(document).on('click', '.reset-updated-attribute', function(){
     var link = jQuery(this)
     var value = link.attr('data-value');
     var input = link.prev();
diff --git a/app/assets/javascripts/nested_form.js b/app/assets/javascripts/nested_form.js
index 47cdf915..b6d4bacc 100644
--- a/app/assets/javascripts/nested_form.js
+++ b/app/assets/javascripts/nested_form.js
@@ -1,5 +1,5 @@
 function addNestedFormBehaviour() {
-  $(".delete-nested-form-item").live("click", function(event) {
+  $('body').on('click', '.delete-nested-form-item', function(event) {
     var item = $(this).parents('.nested-form-item');
     // Hide item
     item.hide();
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 51bdd47f..c9ac0672 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -8,14 +8,14 @@
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 // Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
 //       have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
+// @fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
+// @fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
+// @fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
+// @fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
+// @fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
 
 // Font Awesome
-@import "fontawesome";
+// @import "fontawesome";
 
 // Glyphicons
 //@import "twitter/bootstrap/sprites.less";
diff --git a/app/models/insurance.rb b/app/models/insurance.rb
index c62fbf67..f78e43d1 100644
--- a/app/models/insurance.rb
+++ b/app/models/insurance.rb
@@ -13,6 +13,7 @@ def to_s
 
   # Vcard
   has_vcards
+  has_one :vcard, :as => :object
   accepts_nested_attributes_for :vcard
   attr_accessible :vcard, :vcard_attributes
   def name
diff --git a/app/views/invoices/show.html.haml b/app/views/invoices/show.html.haml
index 5f8168b6..efad1271 100644
--- a/app/views/invoices/show.html.haml
+++ b/app/views/invoices/show.html.haml
@@ -1,6 +1,6 @@
 .contextual
   = icon_link_to t_title(:show, Patient), resource.patient, :icon => :show
-  = contextual_link_to :print, { :method => :post, :remote => true }
+  = contextual_link_to :print, nil, { :method => :post, :remote => true }
 
 = render 'show'
 
diff --git a/app/views/treatments/index.html.haml b/app/views/treatments/index.html.haml
index 110c6a26..4c8bb0aa 100644
--- a/app/views/treatments/index.html.haml
+++ b/app/views/treatments/index.html.haml
@@ -1,5 +1,5 @@
 .contextual
-  = contextual_links_for :action => :index
+  = contextual_links_for :index
   = icon_link_to t_title(:new, InvoiceBatchJob), new_invoice_batch_job_path
 
 = boot_page_title
diff --git a/config/sphinx.yml b/config/sphinx.yml
index f7a5b3bf..d2d98626 100644
--- a/config/sphinx.yml
+++ b/config/sphinx.yml
@@ -7,6 +7,7 @@ common: &common
   charset_table: "0..9, a..z, _, A..Z->a..z, U+00C0->a, U+00C1->a, U+00C2->a, U+00C3->a, U+00C4->a, U+00C5->a, U+00C7->c, U+00C8->e, U+00C9->e, U+00CA->e, U+00CB->e, U+00CC->i, U+00CD->i, U+00CE->i, U+00CF->i, U+00D1->n, U+00D2->o, U+00D3->o, U+00D4->o, U+00D5->o, U+00D6->o, U+00D9->u, U+00DA->u, U+00DB->u, U+00DC->u, U+00DD->y, U+00E0->a, U+00E1->a, U+00E2->a, U+00E3->a, U+00E4->a, U+00E5->a, U+00E7->c, U+00E8->e, U+00E9->e, U+00EA->e, U+00EB->e, U+00EC->i, U+00ED->i, U+00EE->i, U+00EF->i, U+00F1->n, U+00F2->o, U+00F3->o, U+00F4->o, U+00F5->o, U+00F6->o, U+00F9->u, U+00FA->u, U+00FB->u, U+00FC->u, U+00FD->y, U+00FF->y, U+0100->a, U+0101->a, U+0102->a, U+0103->a, U+0104->a, U+0105->a, U+0106->c, U+0107->c, U+0108->c, U+0109->c, U+010A->c, U+010B->c, U+010C->c, U+010D->c, U+010E->d, U+010F->d, U+0112->e, U+0113->e, U+0114->e, U+0115->e, U+0116->e, U+0117->e, U+0118->e, U+0119->e, U+011A->e, U+011B->e, U+011C->g, U+011D->g, U+011E->g, U+011F->g, U+0120->g, U+0121->g, U+0122->g, U+0123->g, U+0124->h, U+0125->h, U+0128->i, U+0129->i, U+012A->i, U+012B->i, U+012C->i, U+012D->i, U+012E->i, U+012F->i, U+0130->i, U+0134->j, U+0135->j, U+0136->k, U+0137->k, U+0139->l, U+013A->l, U+013B->l, U+013C->l, U+013D->l, U+013E->l, U+0142->l, U+0143->n, U+0144->n, U+0145->n, U+0146->n, U+0147->n, U+0148->n, U+014C->o, U+014D->o, U+014E->o, U+014F->o, U+0150->o, U+0151->o, U+0154->r, U+0155->r, U+0156->r, U+0157->r, U+0158->r, U+0159->r, U+015A->s, U+015B->s, U+015C->s, U+015D->s, U+015E->s, U+015F->s, U+0160->s, U+0161->s, U+0162->t, U+0163->t, U+0164->t, U+0165->t, U+0168->u, U+0169->u, U+016A->u, U+016B->u, U+016C->u, U+016D->u, U+016E->u, U+016F->u, U+0170->u, U+0171->u, U+0172->u, U+0173->u, U+0174->w, U+0175->w, U+0176->y, U+0177->y, U+0178->y, U+0179->z, U+017A->z, U+017B->z, U+017C->z, U+017D->z, U+017E->z, U+01A0->o, U+01A1->o, U+01AF->u, U+01B0->u, U+01CD->a, U+01CE->a, U+01CF->i, U+01D0->i, U+01D1->o, U+01D2->o, U+01D3->u, U+01D4->u, U+01D5->u, U+01D6->u, U+01D7->u, U+01D8->u, U+01D9->u, U+01DA->u, U+01DB->u, U+01DC->u, U+01DE->a, U+01DF->a, U+01E0->a, U+01E1->a, U+01E6->g, U+01E7->g, U+01E8->k, U+01E9->k, U+01EA->o, U+01EB->o, U+01EC->o, U+01ED->o, U+01F0->j, U+01F4->g, U+01F5->g, U+01F8->n, U+01F9->n, U+01FA->a, U+01FB->a, U+0200->a, U+0201->a, U+0202->a, U+0203->a, U+0204->e, U+0205->e, U+0206->e, U+0207->e, U+0208->i, U+0209->i, U+020A->i, U+020B->i, U+020C->o, U+020D->o, U+020E->o, U+020F->o, U+0210->r, U+0211->r, U+0212->r, U+0213->r, U+0214->u, U+0215->u, U+0216->u, U+0217->u, U+0218->s, U+0219->s, U+021A->t, U+021B->t, U+021E->h, U+021F->h, U+0226->a, U+0227->a, U+0228->e, U+0229->e, U+022A->o, U+022B->o, U+022C->o, U+022D->o, U+022E->o, U+022F->o, U+0230->o, U+0231->o, U+0232->y, U+0233->y, U+1E00->a, U+1E01->a, U+1E02->b, U+1E03->b, U+1E04->b, U+1E05->b, U+1E06->b, U+1E07->b, U+1E08->c, U+1E09->c, U+1E0A->d, U+1E0B->d, U+1E0C->d, U+1E0D->d, U+1E0E->d, U+1E0F->d, U+1E10->d, U+1E11->d, U+1E12->d, U+1E13->d, U+1E14->e, U+1E15->e, U+1E16->e, U+1E17->e, U+1E18->e, U+1E19->e, U+1E1A->e, U+1E1B->e, U+1E1C->e, U+1E1D->e, U+1E1E->f, U+1E1F->f, U+1E20->g, U+1E21->g, U+1E22->h, U+1E23->h, U+1E24->h, U+1E25->h, U+1E26->h, U+1E27->h, U+1E28->h, U+1E29->h, U+1E2A->h, U+1E2B->h, U+1E2C->i, U+1E2D->i, U+1E2E->i, U+1E2F->i, U+1E30->k, U+1E31->k, U+1E32->k, U+1E33->k, U+1E34->k, U+1E35->k, U+1E36->l, U+1E37->l, U+1E38->l, U+1E39->l, U+1E3A->l, U+1E3B->l, U+1E3C->l, U+1E3D->l, U+1E3E->m, U+1E3F->m, U+1E40->m, U+1E41->m, U+1E42->m, U+1E43->m, U+1E44->n, U+1E45->n, U+1E46->n, U+1E47->n, U+1E48->n, U+1E49->n, U+1E4A->n, U+1E4B->n, U+1E4C->o, U+1E4D->o, U+1E4E->o, U+1E4F->o, U+1E50->o, U+1E51->o, U+1E52->o, U+1E53->o, U+1E54->p, U+1E55->p, U+1E56->p, U+1E57->p, U+1E58->r, U+1E59->r, U+1E5A->r, U+1E5B->r, U+1E5C->r, U+1E5D->r, U+1E5E->r, U+1E5F->r, U+1E60->s, U+1E61->s, U+1E62->s, U+1E63->s, U+1E64->s, U+1E65->s, U+1E66->s, U+1E67->s, U+1E68->s, U+1E69->s, U+1E6A->t, U+1E6B->t, U+1E6C->t, U+1E6D->t, U+1E6E->t, U+1E6F->t, U+1E70->t, U+1E71->t, U+1E72->u, U+1E73->u, U+1E74->u, U+1E75->u, U+1E76->u, U+1E77->u, U+1E78->u, U+1E79->u, U+1E7A->u, U+1E7B->u, U+1E7C->v, U+1E7D->v, U+1E7E->v, U+1E7F->v, U+1E80->w, U+1E81->w, U+1E82->w, U+1E83->w, U+1E84->w, U+1E85->w, U+1E86->w, U+1E87->w, U+1E88->w, U+1E89->w, U+1E8A->x, U+1E8B->x, U+1E8C->x, U+1E8D->x, U+1E8E->y, U+1E8F->y, U+1E96->h, U+1E97->t, U+1E98->w, U+1E99->y, U+1EA0->a, U+1EA1->a, U+1EA2->a, U+1EA3->a, U+1EA4->a, U+1EA5->a, U+1EA6->a, U+1EA7->a, U+1EA8->a, U+1EA9->a, U+1EAA->a, U+1EAB->a, U+1EAC->a, U+1EAD->a, U+1EAE->a, U+1EAF->a, U+1EB0->a, U+1EB1->a, U+1EB2->a, U+1EB3->a, U+1EB4->a, U+1EB5->a, U+1EB6->a, U+1EB7->a, U+1EB8->e, U+1EB9->e, U+1EBA->e, U+1EBB->e, U+1EBC->e, U+1EBD->e, U+1EBE->e, U+1EBF->e, U+1EC0->e, U+1EC1->e, U+1EC2->e, U+1EC3->e, U+1EC4->e, U+1EC5->e, U+1EC6->e, U+1EC7->e, U+1EC8->i, U+1EC9->i, U+1ECA->i, U+1ECB->i, U+1ECC->o, U+1ECD->o, U+1ECE->o, U+1ECF->o, U+1ED0->o, U+1ED1->o, U+1ED2->o, U+1ED3->o, U+1ED4->o, U+1ED5->o, U+1ED6->o, U+1ED7->o, U+1ED8->o, U+1ED9->o, U+1EDA->o, U+1EDB->o, U+1EDC->o, U+1EDD->o, U+1EDE->o, U+1EDF->o, U+1EE0->o, U+1EE1->o, U+1EE2->o, U+1EE3->o, U+1EE4->u, U+1EE5->u, U+1EE6->u, U+1EE7->u, U+1EE8->u, U+1EE9->u, U+1EEA->u, U+1EEB->u, U+1EEC->u, U+1EED->u, U+1EEE->u, U+1EEF->u, U+1EF0->u, U+1EF1->u, U+1EF2->y, U+1EF3->y, U+1EF4->y, U+1EF5->y, U+1EF6->y, U+1EF7->y, U+1EF8->y, U+1EF9->y"
   use_socket: true
   mem_limit: 128M
+  binlog_path: log
 
 # Environments
 development:

From 3178778502d100890ce58cb3d9f36dab8da89770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 19:21:31 +0100
Subject: [PATCH 13/34] Move last divider for invoices menu into condition.

---
 config/navigation.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/navigation.rb b/config/navigation.rb
index 26971e98..4f87cdc5 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -46,9 +46,9 @@
       entry.item :new_esr_file, t_title(:new, EsrFile), new_esr_file_path
       entry.item :esr_files, t_title(:index, EsrFile), esr_files_path
 
-      entry.item :divider, "", :class => 'divider'
-
       if current_tenant.settings['modules.returned_invoices']
+        entry.item :divider, "", :class => 'divider'
+
         entry.item :returned_invoices, t_model(ReturnedInvoice), returned_invoices_path
       end
     end

From 442363f07ad58165117c53dcc8d156a002efae76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 19:34:10 +0100
Subject: [PATCH 14/34] Drop broken appointment logic.

---
 app/controllers/appointments_controller.rb    | 139 ------------------
 app/models/appointment.rb                     |  51 -------
 app/models/patient.rb                         |   1 -
 app/views/appointments/_form.html.haml        |  12 --
 app/views/appointments/_item.html.haml        |  13 --
 app/views/appointments/_list.html.haml        |   4 -
 app/views/appointments/_list_footer.html.haml |   2 -
 app/views/appointments/_list_header.html.haml |   6 -
 .../appointments/_patient_item.html.haml      |  12 --
 .../appointments/_patient_list.html.haml      |   7 -
 app/views/appointments/_sidebar.html.haml     |   8 -
 app/views/appointments/index.html.haml        |   4 -
 config/routes.rb                              |   7 -
 13 files changed, 266 deletions(-)
 delete mode 100644 app/controllers/appointments_controller.rb
 delete mode 100644 app/models/appointment.rb
 delete mode 100644 app/views/appointments/_form.html.haml
 delete mode 100644 app/views/appointments/_item.html.haml
 delete mode 100644 app/views/appointments/_list.html.haml
 delete mode 100644 app/views/appointments/_list_footer.html.haml
 delete mode 100644 app/views/appointments/_list_header.html.haml
 delete mode 100644 app/views/appointments/_patient_item.html.haml
 delete mode 100644 app/views/appointments/_patient_list.html.haml
 delete mode 100644 app/views/appointments/_sidebar.html.haml
 delete mode 100644 app/views/appointments/index.html.haml

diff --git a/app/controllers/appointments_controller.rb b/app/controllers/appointments_controller.rb
deleted file mode 100644
index d74bee71..00000000
--- a/app/controllers/appointments_controller.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*- encoding : utf-8 -*-
-class AppointmentsController < AuthorizedController
-  # Filter
-  has_scope :by_period, :using => [:from, :to]
-
-  # GET /appointments
-  def index
-    @appointments = apply_scopes(Appointment).active.order(:date).page params['page']
-    @recalls = apply_scopes(Recall).active.order(:due_date).page params['page']
-  end
-
-  # GET /patients/1/appointments/new
-  def new
-    @patient = Patient.find(params[:patient_id])
-    @appointment  = @patient.appointments.build
-
-    respond_to do |format|
-      format.html { }
-      format.js {
-        render :update do |page|
-          page.replace_html "new_appointment", :partial => 'form'
-        end
-      }
-    end
-  end
-
-  # PUT /patients/1/appointment
-  def create
-    @patient = Patient.find(params[:patient_id])
-    @appointment  = @patient.appointments.build(params[:appointment])
-
-    if @appointment.save
-      respond_to do |format|
-        format.html { }
-        format.js {
-          render :update do |page|
-            page.replace_html 'appointments', :partial => 'appointments/patient_item', :collection => @patient.appointments.active
-            page.replace_html 'new_appointment'
-          end
-        }
-      end
-    else
-      respond_to do |format|
-        format.html { }
-        format.js {
-          render :update do |page|
-            page.replace 'appointment_form', :partial => 'appointments/form', :object => @appointment
-          end
-        }
-      end
-    end
-  end
-
-  # GET /appointment/1/edit
-  def edit
-    @patient = Patient.find(params[:patient_id])
-    @appointment = Appointment.find(params[:id])
-
-    respond_to do |format|
-      format.html { }
-      format.js {
-        render :update do |page|
-          page.replace_html 'new_appointment', :partial => 'appointments/form'
-        end
-      }
-    end
-  end
-
-  # PUT /appointment/1
-  # PUT /patients/1/appointment/2
-  def update
-    @patient = Patient.find(params[:patient_id])
-    @appointment = Appointment.find(params[:id])
-
-    if @appointment.update_attributes(params[:appointment])
-      respond_to do |format|
-        format.html { }
-        format.js {
-          render :update do |page|
-            page.replace_html 'appointments', :partial => 'appointments/patient_item', :collection => @patient.appointments.active
-            page.replace_html 'new_appointment'
-          end
-        }
-      end
-    else
-      respond_to do |format|
-        format.html { }
-        format.js {
-          render :update do |page|
-            page.replace_html 'appointment_form', :partial => 'appointments/form'
-          end
-        }
-      end
-    end
-  end
-
-  # POST /appointment/1/obey
-  def obey
-    @appointment = Appointment.find(params[:id])
-    @appointment.obey
-    @appointment.save
-
-    respond_to do |format|
-      format.html { }
-      format.js {
-        render :update do |page|
-          page.remove "appointment_#{@appointment.id}"
-        end
-      }
-    end
-  end
-
-  # DELETE /appointment/1
-  def destroy
-    @appointment = Appointment.find(params[:id])
-    @appointment.destroy
-
-    respond_to do |format|
-      format.html { }
-      format.js {
-        render :update do |page|
-          page.remove "appointment_#{@appointment.id}"
-        end
-      }
-    end
-  end
-
-  # GET /patients/1/appointments/1
-  def show
-    @appointment  = Appointment.find(params[:id])
-    @patient = @appointment.patient
-
-    respond_to do |format|
-      format.pdf {
-        render :layout => false
-      }
-    end
-  end
-end
diff --git a/app/models/appointment.rb b/app/models/appointment.rb
deleted file mode 100644
index 101c6d91..00000000
--- a/app/models/appointment.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- encoding : utf-8 -*-
-class Appointment < ActiveRecord::Base
-  # Associations
-  belongs_to :patient
-  has_one :recall
-
-  # Validations
-  validates_presence_of :patient
-  validates_date :date
-
-  # State Machine
-  include AASM
-  aasm_column :state
-
-  aasm_initial_state :scheduled
-
-  aasm_state :proposed
-  aasm_state :scheduled
-  aasm_state :canceled
-  scope :active, :conditions => {:state => ['proposed', 'scheduled']}
-
-  aasm_event :accept do
-    transitions :to => :scheduled, :from => :proposed
-  end
-  aasm_event :cancel do
-    transitions :to => :canceled, :from => [:proposed, :scheduled]
-  end
-
-  # Scopes
-  scope :by_period, lambda {|from, to| { :conditions => { :date => from..to } } }
-
-  def from
-    duration_from.try(:to_time)
-  end
-
-  def from=(value)
-    self.duration_from = Time.zone.parse(value)
-  end
-
-  def to
-    duration_to.try(:to_time)
-  end
-
-  def to=(value)
-    self.duration_to = Time.zone.parse(value)
-  end
-
-  def to_s
-    "#{date} #{[from, to].compact.join(' - ')}"
-  end
-end
diff --git a/app/models/patient.rb b/app/models/patient.rb
index 2482df77..e5813659 100644
--- a/app/models/patient.rb
+++ b/app/models/patient.rb
@@ -45,7 +45,6 @@ def insurance_nr=(value)
 
   has_many :sessions
   has_many :recalls, :order => 'due_date', :dependent => :destroy
-  has_many :appointments, :order => 'date', :dependent => :destroy
 
   # Vcards
   has_vcards
diff --git a/app/views/appointments/_form.html.haml b/app/views/appointments/_form.html.haml
deleted file mode 100644
index 2afdc20c..00000000
--- a/app/views/appointments/_form.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-= javascript_tag "$('appointment_date').focus()"
-#appointment_form
-  = semantic_form_for [@patient, @appointment], :remote => true do |form|
-    = form.semantic_errors
-    = form.inputs do
-      = form.input :date, :as => :date_field, :input_html => {:size => 12, :autocomplete => 'off'}
-      = form.input :from, :as => :time_field, :input_html => {:size => 12, :autocomplete => 'off'}
-      = form.input :to, :as => :time_field, :input_html => {:size => 12, :autocomplete => 'off'}
-      = form.input :remarks, :input_html => {:rows => 3}
-    = form.buttons do
-      = form.submit "Speichern", :class => "icon icon-save"
-      = button_to_function "Abbrechen", "Element.update('new_appointment')", :class => "icon icon-cancel"
diff --git a/app/views/appointments/_item.html.haml b/app/views/appointments/_item.html.haml
deleted file mode 100644
index 4c03de23..00000000
--- a/app/views/appointments/_item.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%tr{:id => "appointment_#{item.id}"}
-  %td= item.date
-  %td= [item.from, item.to].compact.join(' - ')
-  %td= link_to item.patient, item.patient
-  %td= item.remarks
-  %td
-    - for state in item.aasm_events_for_current_state
-      = case state                                                                                                                                                             |
-        when :accept |
-          link_to image_tag('true.png'), :url => accept_patient_appointment_path(item.patient, item), :title => "Termin akzeptiert", :remote => true             |
-        when :cancel |
-          link_to image_tag('delete.png'), :url => patient_appointment_path(item.patient, item), :title => "Termin löschen", :method => :delete, :remote => true |
-        end                                                                                                                                                                    |
diff --git a/app/views/appointments/_list.html.haml b/app/views/appointments/_list.html.haml
deleted file mode 100644
index 26c2589a..00000000
--- a/app/views/appointments/_list.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%table#appointments.table
-  = render :partial => 'appointments/list_header'
-  = render :partial => 'appointments/item', :collection => @appointments
-  = render :partial => 'appointments/list_footer'
diff --git a/app/views/appointments/_list_footer.html.haml b/app/views/appointments/_list_footer.html.haml
deleted file mode 100644
index 3130abea..00000000
--- a/app/views/appointments/_list_footer.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%tr
-  %th{:colspan => "5", :style => "text-align: right"}= paginate
diff --git a/app/views/appointments/_list_header.html.haml b/app/views/appointments/_list_header.html.haml
deleted file mode 100644
index c8d9dc98..00000000
--- a/app/views/appointments/_list_header.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%tr
-  %th Datum
-  %th Zeit
-  %th Patient
-  %th Bemerkungen
-  %th
diff --git a/app/views/appointments/_patient_item.html.haml b/app/views/appointments/_patient_item.html.haml
deleted file mode 100644
index 61244045..00000000
--- a/app/views/appointments/_patient_item.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%tr{:id => "appointment_#{patient_item.id}"}
-  %th= patient_item.date
-  %td= [patient_item.from, patient_item.to].compact.join(' - ')
-  %td= patient_item.remarks
-  %td
-    = link_to image_tag('edit.png'), {:url => edit_patient_appointment_path(@patient, patient_item), :method => :get}, :remote => true
-    - for state in patient_item.aasm_events_for_current_state
-      = case state                                                                                                                                                           |
-        #      when :obey:   link_to image_tag('true.png'), :url => obey_patient_appointment_path(patient_item.patient, patient_item), :title => "Erledigt", :remote => true |
-          when :cancel |
-            link_to image_tag('delete.png'), :url => patient_appointment_path(patient_item.patient, patient_item), :method => :delete, :remote => true           |
-        end                                                                                                                                                                  |
diff --git a/app/views/appointments/_patient_list.html.haml b/app/views/appointments/_patient_list.html.haml
deleted file mode 100644
index e88a978f..00000000
--- a/app/views/appointments/_patient_list.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.contextual
-  = link_to "Termin erfassen", {:url => new_patient_appointment_url(@patient), :method => :get}, :class => "icon icon-add" unless @patient.new_record?, :remote => true
-%h3 Termine
-.box
-  #new_appointment.new_appointment
-  %table#appointments
-    = render :partial => 'appointments/patient_item', :collection => @patient.appointments.open
diff --git a/app/views/appointments/_sidebar.html.haml b/app/views/appointments/_sidebar.html.haml
deleted file mode 100644
index bb0f05f1..00000000
--- a/app/views/appointments/_sidebar.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-- content_for :sidebar do
-  .sub-tabs
-    %h3 Filter
-    %ul
-      %li= link_to "Alle", url_for(:overwrite_params => {:by_period => nil})
-      - for in_month in 0..6
-        - month = Date.today.in(in_month.month)
-        %li= link_to l(month, :format => :month), url_for(:params => params.merge({:by_period => {:from => month.beginning_of_month.to_s(:db), :to => month.end_of_month.to_s(:db)}}))
diff --git a/app/views/appointments/index.html.haml b/app/views/appointments/index.html.haml
deleted file mode 100644
index 396c877a..00000000
--- a/app/views/appointments/index.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-= tab_container 'appointments', "Termine", [                               |
-    {:name => 'appointments', :partial => 'list', :label => 'Termine'},    |
-    {:name => 'recalls', :partial => 'recalls/list', :label => 'Recalls'}, |
-  ]                                                                        |
diff --git a/config/routes.rb b/config/routes.rb
index 12e5a3e6..4f403508 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,13 +106,6 @@
       end
     end
 
-    resources :appointments do
-      member do
-        post :obey
-        post :accept
-      end
-    end
-
     resources :sessions do
       resources :tariff_items
       resources :service_records do

From a2a26502773d3b6ee4ed03bfd26455745a761d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 19:39:30 +0100
Subject: [PATCH 15/34] Drop formtastic.

---
 Gemfile                                   |  1 -
 Gemfile.lock                              |  3 --
 app/controllers/application_controller.rb | 27 -----------
 config/initializers/formtastic.rb         | 56 -----------------------
 config/locales/formtastic.de-CH.yml       |  9 ----
 5 files changed, 96 deletions(-)
 delete mode 100644 config/initializers/formtastic.rb
 delete mode 100644 config/locales/formtastic.de-CH.yml

diff --git a/Gemfile b/Gemfile
index 9dece14f..8e6670e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,6 @@ gem 'lyb_sidebar'
 gem 'less-rails'
 gem 'twitter-bootstrap-rails'
 
-gem 'formtastic'
 gem 'simple_form'
 gem 'kaminari'
 gem 'inherited_resources'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d53a558..1e145270 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,8 +91,6 @@ GEM
     execjs (2.2.2)
     fastercsv (1.5.5)
     ffi (1.9.6)
-    formtastic (3.1.2)
-      actionpack (>= 3.2.13)
     haml (4.0.6)
       tilt
     has_accounts (1.1.3)
@@ -310,7 +308,6 @@ DEPENDENCIES
   devise (~> 2.2)
   fastercsv
   ffi
-  formtastic
   haml
   has_accounts (~> 1.1)
   has_accounts_engine (~> 1.1)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5457147b..b68db258 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -112,33 +112,6 @@ def time_field(method, options = {})
   end
 end
 
-# Monkay patch formtastic
-class Formtastic::SemanticFormBuilder
-  # Outputs a label and standard Rails text field inside the wrapper.
-  def date_field_input(method, options)
-    basic_input_helper(:date_field, :string, method, options)
-  end
-
-  def time_field_input(method, options)
-    basic_input_helper(:time_field, :string, method, options)
-  end
-
-  # Add :validates_date to requiring validations
-  def method_required?(attribute)
-    if @object && @object.class.respond_to?(:reflect_on_validations_for)
-      attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-
-      @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-        [:validates_presence_of, :validates_date, :validates_time].include?(validation.macro) &&
-        validation.name == attribute_sym && !(validation.options.present? && (validation.options[:allow_nil] || validation.options[:allow_blank])) &&
-        (validation.options.present? ? options_require_validation?(validation.options) : true)
-      end
-    else
-      false
-    end
-  end
-end
-
 # Monkey patching Date class
 class Date
   # Date helpers
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
deleted file mode 100644
index 4772d864..00000000
--- a/config/initializers/formtastic.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Set the default text field size when input is a string. Default is 50.
-# Formtastic::SemanticFormBuilder.default_text_field_size = 50
-
-# Set the default text area height when input is a text. Default is 20.
-# Formtastic::SemanticFormBuilder.default_text_area_height = 5
-
-# Should all fields be considered "required" by default?
-# Defaults to true, see ValidationReflection notes below.
-Formtastic::FormBuilder.all_fields_required_by_default = false
-
-# Should select fields have a blank option/prompt by default?
-# Defaults to true.
-# Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
-
-# Set the string that will be appended to the labels/fieldsets which are required
-# It accepts string or procs and the default is a localized version of
-# '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
-# in your locale, it will replace the abbr title properly. But if you don't want to use
-# abbr tag, you can simply give a string as below
-# Formtastic::SemanticFormBuilder.required_string = "(required)"
-
-# Set the string that will be appended to the labels/fieldsets which are optional
-# Defaults to an empty string ("") and also accepts procs (see required_string above)
-# Formtastic::SemanticFormBuilder.optional_string = "(optional)"
-
-# Set the way inline errors will be displayed.
-# Defaults to :sentence, valid options are :sentence, :list and :none
-# Formtastic::SemanticFormBuilder.inline_errors = :sentence
-
-# Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is user without object. Defaults to :humanize.
-# Formtastic::SemanticFormBuilder.label_str_method = :humanize
-
-# Set the array of methods to try calling on parent objects in :select and :radio inputs
-# for the text inside each @<option>@ tag or alongside each radio @<input>@. The first method
-# that is found on the object will be used.
-# Defaults to ["to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-# Formtastic::SemanticFormBuilder.collection_label_methods = [
-#   "to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-
-# Formtastic by default renders inside li tags the input, hints and then
-# errors messages. Sometimes you want the hints to be rendered first than
-# the input, in the following order: hints, input and errors. You can
-# customize it doing just as below:
-# Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
-
-# Specifies if labels/hints for input fields automatically be looked up using I18n.
-# Default value: false. Overridden for specific fields by setting value to true,
-# i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-Formtastic::FormBuilder.i18n_lookups_by_default = true
-
-# You can add custom inputs or override parts of Formtastic by subclassing SemanticFormBuilder and
-# specifying that class here.  Defaults to SemanticFormBuilder.
-# Formtastic::SemanticFormHelper.builder = CustomFormBuilder
diff --git a/config/locales/formtastic.de-CH.yml b/config/locales/formtastic.de-CH.yml
deleted file mode 100644
index a9aaee87..00000000
--- a/config/locales/formtastic.de-CH.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-de-CH:
-  formtastic:
-    :yes: 'Ja'
-    :no: 'Nein'
-    create: '%{model} anlegen'
-    update: '%{model} aktualisieren'
-    save: '%{model} speichern'
-    submit: 'Abschicken'
-    required: 'Erforderlich'

From 0b96aa328f6500c6e8801ac7ed49614a00de2d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 19:41:58 +0100
Subject: [PATCH 16/34] Drop explicit require of nokogiri.

---
 Gemfile                         | 3 ---
 Gemfile.lock                    | 1 -
 app/models/covercard/patient.rb | 1 -
 3 files changed, 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8e6670e8..5433ea7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -124,6 +124,3 @@ gem 'ffi'
 
 # CSV Export
 gem 'csv-mapper'
-
-# XML
-gem 'nokogiri'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e145270..1131544e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -323,7 +323,6 @@ DEPENDENCIES
   lyb_devise_admin
   lyb_sidebar
   mysql2
-  nokogiri
   prawn (= 1.0.0.rc2)
   prawnto
   pry-debugger
diff --git a/app/models/covercard/patient.rb b/app/models/covercard/patient.rb
index da2c337b..cdf55b5d 100644
--- a/app/models/covercard/patient.rb
+++ b/app/models/covercard/patient.rb
@@ -2,7 +2,6 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
-require 'nokogiri'
 
 module Covercard
   class Patient < ActiveRecord::Base

From 220a62ee7b4ba979d3f95d2af3d3668cea4a5a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 2 Jan 2015 23:30:40 +0100
Subject: [PATCH 17/34] Sync Gemfile with hozr.

---
 Gemfile         | 162 ++++++++++++++++++++++++++++--------------------
 Gemfile.lock    | 121 +++++++++++++++++++++++++++++++-----
 INSTALL.textile |   2 +-
 3 files changed, 200 insertions(+), 85 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5433ea7d..bf4613c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,14 @@
+# Gemfile
+# =======
+# Policies:
+# * We do not add versioned dependencies unless needed
+# * If we add versioned dependencies, we document the reason
+# * We use single quotes
+# * We use titles to group related gems
+
 # Settings
 # ========
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Rails
 # =====
@@ -11,65 +19,61 @@ gem 'rails', '~> 3.2'
 gem 'unicorn'
 
 # Database
-gem 'sqlite3'
+# ========
 gem 'mysql2'
+gem 'sqlite3'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'coffee-rails'
-  gem 'therubyracer'
-  gem 'uglifier'
-end
-
-# Development
-# ===========
-group :development do
-  # RDoc
-  gem 'rdoc'
+# Asset Pipeline
+# ==============
+gem 'less-rails'
+gem 'sass-rails'
+gem 'uglifier'
+gem 'coffee-rails'
+gem 'therubyracer'
+gem 'quiet_assets'
 
-  # Deployment
-  gem 'capones_recipes'
-end
+# CRUD
+# ====
+gem 'inherited_resources'
+gem 'has_scope'
+gem 'kaminari'
+gem 'show_for'
+gem 'i18n_rails_helpers'
 
-# Test
+# I18n
 # ====
-group :test, :development do
-  # Console
-  gem 'pry-rails'
-  gem 'pry-doc'
-  gem 'pry-debugger'
-end
+gem 'routing-filter'
 
-# Standard helpers
-# ================
-gem 'haml'
-gem 'sass'
+# UI
+# ==
 gem 'jquery-rails'
-
-# Styling
-gem 'lyb_sidebar'
-gem 'less-rails'
+gem 'haml'
 gem 'twitter-bootstrap-rails'
+gem 'lyb_sidebar'
+gem 'simple-navigation'
 
+# Forms
+# =====
 gem 'simple_form'
-gem 'kaminari'
-gem 'inherited_resources'
-gem 'has_scope'
-gem 'i18n_rails_helpers'
-gem 'show_for'
+gem 'select2-rails'
+gem 'in_place_editing'
 
-# Navigation
-gem 'simple-navigation'
 
-# CyDoc
-# =====
-# Authentication
+# Access Control
+# ==============
+gem 'devise', '~> 2.2' # Changed API
+gem 'cancan', '1.6.8' # Issue with aliases
+gem 'lyb_devise_admin'
+
+# State Machine
 gem 'aasm', '~> 3.0' # Changed API
 
 # Date/Time handling
 gem 'validates_timeliness'
 
+# Application Settings
+gem 'ledermann-rails-settings', '~> 1.2', :require => 'rails-settings' # Changed API
+
 # Addresses
 gem 'unicode_utils'
 gem 'has_vcards', '~> 0.20' # Data model changes, needs synced release with CyDoc
@@ -77,50 +81,74 @@ gem 'autocompletion'
 gem 'swissmatch'
 gem 'swissmatch-location', :require => 'swissmatch/location/autoload'
 
+# Files
+gem 'carrierwave'
+
 # Billing
 gem 'has_accounts', '~> 1.1' # Changed API
 gem 'has_accounts_engine', '~> 1.1' # Changed API
 gem 'acts-as-taggable-on'
+gem 'vesr'
 
-# Import
+# Import / Export
 gem 'fastercsv'
 gem 'activerecord-sqlserver-adapter'
+gem 'csv-mapper'
 
 # Multiple Databases
 gem 'use_db'
 
-# Forms
-gem 'in_place_editing'
-gem 'select2-rails'
+# PDF generation
+gem 'prawn', '1.0.0.rc2' # table support needs porting, group has been dropped
+gem 'prawnto'
 
-# Authentication
-gem 'devise', '~> 2.2' # Changed API
-gem 'cancan', '1.6.8' # Issue with aliases
-gem 'lyb_devise_admin'
+# Printing
+gem 'cupsffi'
 
 # Search
 gem 'thinking-sphinx', '~> 2.0' # Changed API
 
-# Uploads
-gem 'carrierwave'
 
-# PDF
-gem 'prawn', '1.0.0.rc2' # table support needs porting, group has been dropped
-gem 'prawnto'
+# Development
+# ===========
+group :development do
+  # Debugging
+  gem 'better_errors'
+  gem 'binding_of_caller'  # Needed by binding_of_caller to enable html console
 
+  # Deployment
+  gem 'capones_recipes'
+end
 
-# Locale setting
-gem 'routing-filter'
+# Dev and Test
+# ============
+group :development, :test do
+  # Testing Framework
+  gem 'rspec-rails'
+  gem 'rspec-activemodel-mocks'
 
-# Settings
-gem 'ledermann-rails-settings', '~> 1.2', :require => 'rails-settings' # Changed API
+  # Browser
+  gem 'capybara'
+  gem 'capybara-screenshot'
+  gem 'poltergeist'
+  gem 'selenium-webdriver'
 
-# ESR support
-gem 'vesr'
+  # Matchers/Helpers
+  gem 'accept_values_for'
 
-# Printing
-gem 'cupsffi'
-gem 'ffi'
+  # Debugger
+  gem 'pry-rails'
+  gem 'pry-byebug'
 
-# CSV Export
-gem 'csv-mapper'
+  # Fixtures
+  gem 'database_cleaner'
+  gem 'connection_pool'
+  gem "factory_girl_rails"
+end
+
+# Docs
+# ====
+group :doc do
+  # Docs
+  gem 'rdoc'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1131544e..7c464476 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,11 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
     aasm (3.4.0)
+    accept_values_for (0.7.1)
+      activemodel (>= 3, < 5)
+      rspec (>= 2.0, < 4.0)
     actionmailer (3.2.21)
       actionpack (= 3.2.21)
       mail (~> 2.5.4)
@@ -34,13 +37,24 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (3.4.2)
       activerecord (>= 3.2, < 5)
+    addressable (2.3.6)
     afm (0.2.2)
     arel (3.0.3)
     autocompletion (0.0.3)
     bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
+    better_errors (2.1.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.0.4)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     cancan (1.6.8)
     cap-recipes (0.3.39)
     capistrano (2.15.5)
@@ -57,11 +71,24 @@ GEM
       capistrano (~> 2.0)
       capistrano-ext
       capistrano_colors
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    capybara-screenshot (1.0.3)
+      capybara (>= 1.0, < 3)
+      colored
+      launchy
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
+    childprocess (0.5.5)
+      ffi (~> 1.0, >= 1.0.11)
+    cliver (0.3.2)
     coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -70,25 +97,30 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
+    colored (1.2)
     columnize (0.9.0)
     commonjs (0.2.7)
+    connection_pool (2.1.0)
     csv-mapper (0.5.1)
       fastercsv
     cupsffi (0.1.4)
       ffi
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
+    database_cleaner (1.3.0)
+    debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.7)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.2.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     fastercsv (1.5.5)
     ffi (1.9.6)
     haml (4.0.6)
@@ -132,6 +164,8 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     ledermann-rails-settings (1.2.1)
       activerecord (>= 2.3)
     less (2.6.0)
@@ -167,6 +201,11 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
     prawn (1.0.0.rc2)
       afm
@@ -180,14 +219,13 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.3)
-      debugger (~> 1.3)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-doc (0.6.0)
-      pry (~> 0.9)
-      yard (~> 0.8)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    quiet_assets (1.1.0)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -220,11 +258,44 @@ GEM
     riddle (1.5.11)
     routing-filter (0.3.1)
       actionpack
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-activemodel-mocks (1.0.1)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      rspec-mocks (>= 2.99, < 4.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     ruby-rc4 (0.1.5)
     rubyzip (1.1.6)
     sass (3.4.9)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     select2-rails (3.5.9.1)
       thor (~> 0.14)
+    selenium-webdriver (2.44.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
     show_for (0.3.0)
       actionpack (>= 3.2, < 5)
       activemodel (>= 3.2, < 5)
@@ -289,25 +360,37 @@ GEM
     vesr (0.13.1)
     warden (1.2.3)
       rack (>= 1.0)
-    yard (0.8.7.6)
+    websocket (1.2.1)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aasm (~> 3.0)
+  accept_values_for
   activerecord-sqlserver-adapter
   acts-as-taggable-on
   autocompletion
+  better_errors
+  binding_of_caller
   cancan (= 1.6.8)
   capones_recipes
+  capybara
+  capybara-screenshot
   carrierwave
   coffee-rails
+  connection_pool
   csv-mapper
   cupsffi
+  database_cleaner
   devise (~> 2.2)
+  factory_girl_rails
   fastercsv
-  ffi
   haml
   has_accounts (~> 1.1)
   has_accounts_engine (~> 1.1)
@@ -323,16 +406,20 @@ DEPENDENCIES
   lyb_devise_admin
   lyb_sidebar
   mysql2
+  poltergeist
   prawn (= 1.0.0.rc2)
   prawnto
-  pry-debugger
-  pry-doc
+  pry-byebug
   pry-rails
+  quiet_assets
   rails (~> 3.2)
   rdoc
   routing-filter
-  sass
+  rspec-activemodel-mocks
+  rspec-rails
+  sass-rails
   select2-rails
+  selenium-webdriver
   show_for
   simple-navigation
   simple_form
diff --git a/INSTALL.textile b/INSTALL.textile
index be91cb46..14902f1a 100644
--- a/INSTALL.textile
+++ b/INSTALL.textile
@@ -2,7 +2,7 @@ We currently support installing on Debian 5.0 Lenny and Ubuntu 12.04 systems.
 
 h2. Install Ruby'n'Rails
 
-CyDoc is developed and tested using Rails 3.2 and Ruby 1.9.
+CyDoc is developed and tested using Rails 3.2 and Ruby 2.1.
 
 Install packages to needed:
 

From 4665230363742511eeeaa2bba3ac65592a120142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Sat, 3 Jan 2015 01:01:53 +0100
Subject: [PATCH 18/34] Use self. for table_name and primary_key in Models.

---
 app/models/tarmed/leistung_digniquali.rb | 4 ++--
 app/models/tarmed/leistung_hierarchie.rb | 2 +-
 app/models/tarmed/leistung_text.rb       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/tarmed/leistung_digniquali.rb b/app/models/tarmed/leistung_digniquali.rb
index bfed46da..1aacb63a 100644
--- a/app/models/tarmed/leistung_digniquali.rb
+++ b/app/models/tarmed/leistung_digniquali.rb
@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 class Tarmed::LeistungDigniquali < Tarmed::Base
-  set_table_name 'LEISTUNG_DIGNIQUALI'
-  set_primary_key 'LNR'
+  self.table_name = 'LEISTUNG_DIGNIQUALI'
+  self.primary_key = 'LNR'
 end
diff --git a/app/models/tarmed/leistung_hierarchie.rb b/app/models/tarmed/leistung_hierarchie.rb
index 1bbd29b9..8aa47765 100644
--- a/app/models/tarmed/leistung_hierarchie.rb
+++ b/app/models/tarmed/leistung_hierarchie.rb
@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Tarmed::LeistungHierarchie < Tarmed::Base
-  set_table_name "LEISTUNG_HIERARCHIE"
+  self.table_name = "LEISTUNG_HIERARCHIE"
 
   belongs_to :master, :class_name => 'Leistung', :foreign_key => 'LNR_MASTER'
   belongs_to :slave, :class_name => 'Leistung', :foreign_key => 'LNR_SLAVE'
diff --git a/app/models/tarmed/leistung_text.rb b/app/models/tarmed/leistung_text.rb
index 136bd90e..2e9a79dd 100644
--- a/app/models/tarmed/leistung_text.rb
+++ b/app/models/tarmed/leistung_text.rb
@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 class Tarmed::LeistungText < Tarmed::Base
-  set_table_name 'LEISTUNG_TEXT'
-  set_primary_key "LNR"
-  
+  self.table_name = 'LEISTUNG_TEXT'
+  self.primary_key = "LNR"
+
   belongs_to :leistung, :class_name => 'Tarmed::Leistung', :foreign_key => 'LNR'
   has_one :digniquali, :class_name => 'LeistungDigniquali', :foreign_key => 'LNR'
 end

From ba489d4ca976e25743234bc00fc89f143fd96dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Sat, 3 Jan 2015 01:14:31 +0100
Subject: [PATCH 19/34] Fix Insurance model stack level issues.

---
 app/models/insurances/import.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/insurances/import.rb b/app/models/insurances/import.rb
index 83d4bf0c..9ee813dc 100644
--- a/app/models/insurances/import.rb
+++ b/app/models/insurances/import.rb
@@ -37,4 +37,5 @@ def import_all
   end
 end
 
-Insurance.send :include, Insurances::Import
+# TODO: fix as this triggeres stack level too deep
+# Insurance.send :include, Insurances::Import

From 6641a5931e189aca498903a8ba1a82db5384aad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Sat, 3 Jan 2015 01:14:58 +0100
Subject: [PATCH 20/34] Port to new aasm API.

---
 Gemfile                        |  2 +-
 Gemfile.lock                   |  4 ++--
 app/models/recall.rb           | 39 ++++++++++++++++++----------------
 app/models/returned_invoice.rb | 30 +++++++++++++-------------
 app/models/session.rb          | 19 +++++++++--------
 5 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf4613c7..589f3292 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'cancan', '1.6.8' # Issue with aliases
 gem 'lyb_devise_admin'
 
 # State Machine
-gem 'aasm', '~> 3.0' # Changed API
+gem 'aasm'
 
 # Date/Time handling
 gem 'validates_timeliness'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7c464476..4c03043a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    aasm (3.4.0)
+    aasm (4.0.8)
     accept_values_for (0.7.1)
       activemodel (>= 3, < 5)
       rspec (>= 2.0, < 4.0)
@@ -371,7 +371,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aasm (~> 3.0)
+  aasm
   accept_values_for
   activerecord-sqlserver-adapter
   acts-as-taggable-on
diff --git a/app/models/recall.rb b/app/models/recall.rb
index 6c40f645..d9491d62 100644
--- a/app/models/recall.rb
+++ b/app/models/recall.rb
@@ -16,27 +16,30 @@ class Recall < ActiveRecord::Base
 
   # State Machine
   include AASM
-  aasm_column :state
+  aasm do
+    initial_state = :scheduled
 
-  aasm_initial_state :scheduled
+    state :scheduled
+    state :canceled
+    state :prepared
+    state :sent
+    state :obeyed
 
-  aasm_state :scheduled
-  aasm_state :canceled
-  aasm_state :prepared
-  aasm_state :sent
-  aasm_state :obeyed
+    event :cancel do
+      transitions :to => :canceled, :from => [:scheduled, :sent]
+    end
 
-  aasm_event :cancel do
-    transitions :to => :canceled, :from => [:scheduled, :sent]
-  end
-  aasm_event :prepare do
-    transitions :to => :prepared, :from => :scheduled
-  end
-  aasm_event :send_notice do
-    transitions :to => :sent, :from => [:prepared, :scheduled], :on_transition => :sending
-  end
-  aasm_event :obey do
-    transitions :to => :obeyed, :from => :sent
+    event :prepare do
+      transitions :to => :prepared, :from => :scheduled
+    end
+
+    event :send_notice do
+      transitions :to => :sent, :from => [:prepared, :scheduled], :on_transition => :sending
+    end
+
+    event :obey do
+      transitions :to => :obeyed, :from => :sent
+    end
   end
 
   # Scopes
diff --git a/app/models/returned_invoice.rb b/app/models/returned_invoice.rb
index bf1ff891..790248cb 100644
--- a/app/models/returned_invoice.rb
+++ b/app/models/returned_invoice.rb
@@ -13,25 +13,25 @@ def to_s
 
   # State Machine
   include AASM
-  aasm_column :state
-  validates :state , :presence => true
-
-  aasm_initial_state :ready
-  aasm_state :ready
-  aasm_state :request_pending
-  aasm_state :resolved
+  aasm do
+    initial_state = :ready
+    state :ready
+    state :request_pending
+    state :resolved
 
-  aasm_event :queue_request do
-    transitions :from => :ready, :to => :request_pending
-  end
+    event :queue_request do
+      transitions :from => :ready, :to => :request_pending
+    end
 
-  aasm_event :reactivate do
-    transitions :from => [:ready, :request_pending], :to => :resolved
-  end
+    event :reactivate do
+      transitions :from => [:ready, :request_pending], :to => :resolved
+    end
 
-  aasm_event :write_off do
-    transitions :from => [:ready, :request_pending], :to => :resolved
+    event :write_off do
+      transitions :from => [:ready, :request_pending], :to => :resolved
+    end
   end
+  validates :state , :presence => true
 
   scope :by_state, lambda {|value| {:conditions => {:state => value} } }
   scope :active, :conditions => {:state => ["ready", "request_pending"]}
diff --git a/app/models/session.rb b/app/models/session.rb
index 506ed067..0587d1a7 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -20,18 +20,19 @@ class Session < ActiveRecord::Base
 
   # State Machine
   include AASM
-  aasm_column :state
+  aasm do
+    initial_state = :active
 
-  aasm_initial_state :active
+    state :active
+    state :charged
 
-  aasm_state :active
-  aasm_state :charged
+    event :charge do
+      transitions :to => :charged, :from => :active
+    end
 
-  aasm_event :charge do
-    transitions :to => :charged, :from => :active
-  end
-  aasm_event :reactivate do
-    transitions :to => :active, :from => :charged
+    event :reactivate do
+      transitions :to => :active, :from => :charged
+    end
   end
 
   def to_s(format = :default)

From 5de9482a22be3f4ac9ae4c7a6b462c7f93ee5fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Sat, 3 Jan 2015 11:37:58 +0100
Subject: [PATCH 21/34] Drop unused prawnto.

---
 Gemfile      | 1 -
 Gemfile.lock | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 589f3292..e3e46ec7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,6 @@ gem 'use_db'
 
 # PDF generation
 gem 'prawn', '1.0.0.rc2' # table support needs porting, group has been dropped
-gem 'prawnto'
 
 # Printing
 gem 'cupsffi'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c03043a..d22b1af8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,9 +212,6 @@ GEM
       pdf-reader (>= 0.9.0, < 2.0)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    prawnto (0.1.1)
-      prawn
-      rails (>= 2.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -408,7 +405,6 @@ DEPENDENCIES
   mysql2
   poltergeist
   prawn (= 1.0.0.rc2)
-  prawnto
   pry-byebug
   pry-rails
   quiet_assets

From 2029ad44231407e8626e96458ae26331eeadf687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 5 Jan 2015 22:12:45 +0100
Subject: [PATCH 22/34] Drop all tests.

No sensinble test suite exists. Need to start from zero anyway.
---
 spec/controllers/access_control_spec.rb       |  91 ------
 spec/controllers/authenticated_system_spec.rb | 103 -------
 spec/controllers/patient_controller_spec.rb   | 131 --------
 spec/controllers/sessions_controller_spec.rb  | 140 ---------
 spec/controllers/users_controller_spec.rb     | 197 ------------
 spec/controllers/welcome_controller_spec.rb   |  53 ----
 spec/fixtures/doctors.yml                     |  18 --
 spec/fixtures/users.yml                       |  48 ---
 spec/helpers/users_helper_spec.rb             | 142 ---------
 spec/models/doctor_spec.rb                    |  52 ----
 spec/models/patient_spec.rb                   |  55 ----
 spec/models/user_spec.rb                      | 291 ------------------
 spec/rcov.opts                                |   2 -
 spec/spec.opts                                |   4 -
 spec/spec_helper.rb                           |  52 ----
 test/fixtures/.gitignore                      |   4 -
 test/fixtures/accounts.yml                    |   7 -
 test/fixtures/addresses.yml                   |  39 ---
 test/fixtures/analyseliste/analyseliste.csv   |  95 ------
 .../analyseliste/analyseliste_old.csv         |  19 --
 test/fixtures/attachments.yml                 |  15 -
 test/fixtures/doctors.yml                     |  20 --
 test/fixtures/drug_articles.yml               |  63 ----
 test/fixtures/drug_prices.yml                 |  13 -
 test/fixtures/drug_products.yml               |  65 ----
 test/fixtures/drug_substances.yml             |   9 -
 test/fixtures/esr_files.yml                   |  11 -
 test/fixtures/esr_records.yml                 |  27 --
 test/fixtures/imports.yml                     |   7 -
 test/fixtures/insurance_policies.yml          |  17 -
 test/fixtures/offices.yml                     |   7 -
 test/fixtures/patients.yml                    |  31 --
 test/fixtures/postal_codes.yml                |   7 -
 test/fixtures/recalls.yml                     |  11 -
 test/fixtures/service_records.yml             |  31 --
 test/fixtures/sessions.yml                    |   7 -
 test/fixtures/tarifcodes/tarifcodes.csv       | 241 ---------------
 test/fixtures/tariff_codes.yml                |  17 -
 test/fixtures/tariff_items_tariff_items.yml   |   7 -
 test/fixtures/users.yml                       |   7 -
 test/fixtures/vat_classes.yml                 |  17 -
 test/fixtures/vcards.yml                      |  81 -----
 test/functional/accounts_controller_test.rb   |   9 -
 test/functional/bookings_controller_test.rb   |   9 -
 .../functional/bookkeeping_controller_test.rb |   9 -
 test/functional/contact_controller_test.rb    |   9 -
 test/functional/diagnoses_controller_test.rb  |   9 -
 test/functional/doctors_controller_test.rb    |   9 -
 .../drug_articles_controller_test.rb          |   9 -
 test/functional/drugs_controller_test.rb      |   9 -
 .../esr_bookings_controller_test.rb           |   9 -
 .../insurance_policies_controller_test.rb     |   9 -
 test/functional/insurances_controller_test.rb |   9 -
 test/functional/invoices_controller_test.rb   |   9 -
 test/functional/mailings_controller_test.rb   |  19 --
 .../medical_cases_controller_test.rb          |   9 -
 test/functional/patients_controller_test.rb   |  74 -----
 .../phone_numbers_controller_test.rb          |   9 -
 test/functional/recalls_controller_test.rb    |   9 -
 test/functional/search_controller_test.rb     |   9 -
 .../service_items_controller_test.rb          |   9 -
 .../service_records_controller_test.rb        |   9 -
 test/functional/sessions_controller_test.rb   |   9 -
 .../tariff_items_controller_test.rb           |   9 -
 test/functional/treatments_controller_test.rb |   9 -
 test/functional/welcome_controller_test.rb    |   9 -
 .../mocks/test/application_controller_mock.rb |   8 -
 test/test_helper.rb                           |  48 ---
 test/unit/attachment_test.rb                  |   9 -
 test/unit/consultation_test.rb                |   9 -
 test/unit/diagnose_test.rb                    |   9 -
 test/unit/doctor_test.rb                      |  46 ---
 test/unit/drug_article_test.rb                |   9 -
 test/unit/drug_price_test.rb                  |   9 -
 test/unit/drug_product_test.rb                |   9 -
 test/unit/drug_substance_test.rb              |   9 -
 test/unit/employee_test.rb                    |   9 -
 test/unit/esr_file_test.rb                    |   9 -
 test/unit/esr_record_test.rb                  |   9 -
 test/unit/helpers/bookkeeping_helper_test.rb  |   5 -
 .../unit/helpers/drug_articles_helper_test.rb |   5 -
 test/unit/helpers/recalls_helper_test.rb      |   5 -
 test/unit/import_test.rb                      |   9 -
 test/unit/insurance_policy_test.rb            |   9 -
 test/unit/insurance_test.rb                   |   9 -
 test/unit/invoice_test.rb                     |   8 -
 test/unit/law_test.rb                         |   9 -
 test/unit/mail_test.rb                        |  10 -
 test/unit/medical_case_test.rb                |   9 -
 test/unit/office_test.rb                      |   8 -
 test/unit/patient_test.rb                     |  74 -----
 test/unit/patient_vcard_test.rb               |   9 -
 test/unit/postal_code_test.rb                 |   9 -
 test/unit/recall_test.rb                      |   9 -
 test/unit/service_record_test.rb              |  62 ----
 test/unit/session_test.rb                     |   9 -
 test/unit/tariff_code_test.rb                 |   9 -
 test/unit/tariff_item_group_test.rb           |   9 -
 test/unit/tariff_item_test.rb                 |   9 -
 test/unit/tiers_test.rb                       |   9 -
 test/unit/treatment_test.rb                   |   9 -
 test/unit/vat_class_test.rb                   |   9 -
 test/unit/vcard_test.rb                       |  81 -----
 103 files changed, 3130 deletions(-)
 delete mode 100644 spec/controllers/access_control_spec.rb
 delete mode 100644 spec/controllers/authenticated_system_spec.rb
 delete mode 100644 spec/controllers/patient_controller_spec.rb
 delete mode 100644 spec/controllers/sessions_controller_spec.rb
 delete mode 100644 spec/controllers/users_controller_spec.rb
 delete mode 100644 spec/controllers/welcome_controller_spec.rb
 delete mode 100644 spec/fixtures/doctors.yml
 delete mode 100644 spec/fixtures/users.yml
 delete mode 100644 spec/helpers/users_helper_spec.rb
 delete mode 100644 spec/models/doctor_spec.rb
 delete mode 100644 spec/models/patient_spec.rb
 delete mode 100644 spec/models/user_spec.rb
 delete mode 100644 spec/rcov.opts
 delete mode 100644 spec/spec.opts
 delete mode 100644 spec/spec_helper.rb
 delete mode 100644 test/fixtures/.gitignore
 delete mode 100644 test/fixtures/accounts.yml
 delete mode 100644 test/fixtures/addresses.yml
 delete mode 100644 test/fixtures/analyseliste/analyseliste.csv
 delete mode 100644 test/fixtures/analyseliste/analyseliste_old.csv
 delete mode 100644 test/fixtures/attachments.yml
 delete mode 100644 test/fixtures/doctors.yml
 delete mode 100644 test/fixtures/drug_articles.yml
 delete mode 100644 test/fixtures/drug_prices.yml
 delete mode 100644 test/fixtures/drug_products.yml
 delete mode 100644 test/fixtures/drug_substances.yml
 delete mode 100644 test/fixtures/esr_files.yml
 delete mode 100644 test/fixtures/esr_records.yml
 delete mode 100644 test/fixtures/imports.yml
 delete mode 100644 test/fixtures/insurance_policies.yml
 delete mode 100644 test/fixtures/offices.yml
 delete mode 100644 test/fixtures/patients.yml
 delete mode 100644 test/fixtures/postal_codes.yml
 delete mode 100644 test/fixtures/recalls.yml
 delete mode 100644 test/fixtures/service_records.yml
 delete mode 100644 test/fixtures/sessions.yml
 delete mode 100644 test/fixtures/tarifcodes/tarifcodes.csv
 delete mode 100644 test/fixtures/tariff_codes.yml
 delete mode 100644 test/fixtures/tariff_items_tariff_items.yml
 delete mode 100644 test/fixtures/users.yml
 delete mode 100644 test/fixtures/vat_classes.yml
 delete mode 100644 test/fixtures/vcards.yml
 delete mode 100644 test/functional/accounts_controller_test.rb
 delete mode 100644 test/functional/bookings_controller_test.rb
 delete mode 100644 test/functional/bookkeeping_controller_test.rb
 delete mode 100644 test/functional/contact_controller_test.rb
 delete mode 100644 test/functional/diagnoses_controller_test.rb
 delete mode 100644 test/functional/doctors_controller_test.rb
 delete mode 100644 test/functional/drug_articles_controller_test.rb
 delete mode 100644 test/functional/drugs_controller_test.rb
 delete mode 100644 test/functional/esr_bookings_controller_test.rb
 delete mode 100644 test/functional/insurance_policies_controller_test.rb
 delete mode 100644 test/functional/insurances_controller_test.rb
 delete mode 100644 test/functional/invoices_controller_test.rb
 delete mode 100644 test/functional/mailings_controller_test.rb
 delete mode 100644 test/functional/medical_cases_controller_test.rb
 delete mode 100644 test/functional/patients_controller_test.rb
 delete mode 100644 test/functional/phone_numbers_controller_test.rb
 delete mode 100644 test/functional/recalls_controller_test.rb
 delete mode 100644 test/functional/search_controller_test.rb
 delete mode 100644 test/functional/service_items_controller_test.rb
 delete mode 100644 test/functional/service_records_controller_test.rb
 delete mode 100644 test/functional/sessions_controller_test.rb
 delete mode 100644 test/functional/tariff_items_controller_test.rb
 delete mode 100644 test/functional/treatments_controller_test.rb
 delete mode 100644 test/functional/welcome_controller_test.rb
 delete mode 100644 test/mocks/test/application_controller_mock.rb
 delete mode 100644 test/test_helper.rb
 delete mode 100644 test/unit/attachment_test.rb
 delete mode 100644 test/unit/consultation_test.rb
 delete mode 100644 test/unit/diagnose_test.rb
 delete mode 100644 test/unit/doctor_test.rb
 delete mode 100644 test/unit/drug_article_test.rb
 delete mode 100644 test/unit/drug_price_test.rb
 delete mode 100644 test/unit/drug_product_test.rb
 delete mode 100644 test/unit/drug_substance_test.rb
 delete mode 100644 test/unit/employee_test.rb
 delete mode 100644 test/unit/esr_file_test.rb
 delete mode 100644 test/unit/esr_record_test.rb
 delete mode 100644 test/unit/helpers/bookkeeping_helper_test.rb
 delete mode 100644 test/unit/helpers/drug_articles_helper_test.rb
 delete mode 100644 test/unit/helpers/recalls_helper_test.rb
 delete mode 100644 test/unit/import_test.rb
 delete mode 100644 test/unit/insurance_policy_test.rb
 delete mode 100644 test/unit/insurance_test.rb
 delete mode 100644 test/unit/invoice_test.rb
 delete mode 100644 test/unit/law_test.rb
 delete mode 100644 test/unit/mail_test.rb
 delete mode 100644 test/unit/medical_case_test.rb
 delete mode 100644 test/unit/office_test.rb
 delete mode 100644 test/unit/patient_test.rb
 delete mode 100644 test/unit/patient_vcard_test.rb
 delete mode 100644 test/unit/postal_code_test.rb
 delete mode 100644 test/unit/recall_test.rb
 delete mode 100644 test/unit/service_record_test.rb
 delete mode 100644 test/unit/session_test.rb
 delete mode 100644 test/unit/tariff_code_test.rb
 delete mode 100644 test/unit/tariff_item_group_test.rb
 delete mode 100644 test/unit/tariff_item_test.rb
 delete mode 100644 test/unit/tiers_test.rb
 delete mode 100644 test/unit/treatment_test.rb
 delete mode 100644 test/unit/vat_class_test.rb
 delete mode 100644 test/unit/vcard_test.rb

diff --git a/spec/controllers/access_control_spec.rb b/spec/controllers/access_control_spec.rb
deleted file mode 100644
index 413486c6..00000000
--- a/spec/controllers/access_control_spec.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-  # Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead
-# Then, you can remove it from this and the units test.
-include AuthenticatedTestHelper
-
-#
-# A test controller with and without access controls
-#
-class AccessControlTestController < ApplicationController
-  before_filter :login_required, :only => :login_is_required
-  def login_is_required
-    respond_to do |format|
-      @foo = { 'success' => params[:format]||'no fmt given'}
-      format.html do render :text => "success"             end
-      format.xml  do render :xml  => @foo, :status => :ok  end
-      format.json do render :json => @foo, :status => :ok  end
-    end
-  end
-  def login_not_required
-    respond_to do |format|
-      @foo = { 'success' => params[:format]||'no fmt given'}
-      format.html do render :text => "success"             end
-      format.xml  do render :xml  => @foo, :status => :ok  end
-      format.json do render :json => @foo, :status => :ok  end
-    end
-  end
-end
-
-#
-# Access Control
-#
-
-ACCESS_CONTROL_FORMATS = [
-  ['',     "success"],
-  ['xml',  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<hash>\n  <success>xml</success>\n</hash>\n"],
-  ['json', "{\"success\": \"json\"}"],]
-ACCESS_CONTROL_AM_I_LOGGED_IN = [
-  [:i_am_logged_in,     :quentin],
-  [:i_am_not_logged_in, nil],]
-ACCESS_CONTROL_IS_LOGIN_REQD = [
-  :login_not_required,
-  :login_is_required,]
-
-describe AccessControlTestController do
-  fixtures        :users
-  before do
-    # is there a better way to do this?
-    ActionController::Routing::Routes.add_route '/login_is_required',           :controller => 'access_control_test',   :action => 'login_is_required'
-    ActionController::Routing::Routes.add_route '/login_not_required',          :controller => 'access_control_test',   :action => 'login_not_required'
-  end
-
-  ACCESS_CONTROL_FORMATS.each do |format, success_text|
-    ACCESS_CONTROL_AM_I_LOGGED_IN.each do |logged_in_status, user_login|
-      ACCESS_CONTROL_IS_LOGIN_REQD.each do |login_reqd_status|
-        describe "requesting #{format.blank? ? 'html' : format}; #{logged_in_status.to_s.humanize} and #{login_reqd_status.to_s.humanize}" do
-          before do
-            logout_keeping_session!
-            @user = format.blank? ? login_as(user_login) : authorize_as(user_login)
-            get login_reqd_status.to_s, :format => format
-          end
-
-          if ((login_reqd_status == :login_not_required) ||
-              (login_reqd_status == :login_is_required && logged_in_status == :i_am_logged_in))
-            it "succeeds" do
-              response.should have_text(success_text)
-              response.code.to_s.should == '200'
-            end
-
-          elsif (login_reqd_status == :login_is_required && logged_in_status == :i_am_not_logged_in)
-            if ['html', ''].include? format
-              it "redirects me to the log in page" do
-                response.should redirect_to('/session/new')
-              end
-            else
-              it "returns 'Access denied' and a 406 (Access Denied) status code" do
-                response.should have_text("HTTP Basic: Access denied.\n")
-                response.code.to_s.should == '401'
-              end
-            end
-
-          else
-            warn "Oops no case for #{format} and #{logged_in_status.to_s.humanize} and #{login_reqd_status.to_s.humanize}"
-          end
-        end # describe
-
-      end
-    end
-  end # cases
-
-end
diff --git a/spec/controllers/authenticated_system_spec.rb b/spec/controllers/authenticated_system_spec.rb
deleted file mode 100644
index ac5685ab..00000000
--- a/spec/controllers/authenticated_system_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-# Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead
-# Then, you can remove it from this and the units test.
-include AuthenticatedTestHelper
-include AuthenticatedSystem
-def action_name() end
-
-describe SessionsController do
-  fixtures :users
-  
-  before do
-    # FIXME -- sessions controller not testing xml logins 
-    stub!(:authenticate_with_http_basic).and_return nil
-  end    
-  describe "logout_killing_session!" do
-    before do
-      login_as :quentin
-      stub!(:reset_session)
-    end
-    it 'resets the session'         do should_receive(:reset_session);         logout_killing_session! end
-    it 'kills my auth_token cookie' do should_receive(:kill_remember_cookie!); logout_killing_session! end
-    it 'nils the current user'      do logout_killing_session!; current_user.should be_nil end
-    it 'kills :user_id session' do
-      session.stub!(:[]=)
-      session.should_receive(:[]=).with(:user_id, nil).at_least(:once)
-      logout_killing_session!
-    end
-    it 'forgets me' do    
-      current_user.remember_me
-      current_user.remember_token.should_not be_nil; current_user.remember_token_expires_at.should_not be_nil
-      User.find(1).remember_token.should_not be_nil; User.find(1).remember_token_expires_at.should_not be_nil
-      logout_killing_session!
-      User.find(1).remember_token.should     be_nil; User.find(1).remember_token_expires_at.should     be_nil
-    end
-  end
-
-  describe "logout_keeping_session!" do
-    before do
-      login_as :quentin
-      stub!(:reset_session)
-    end
-    it 'does not reset the session' do should_not_receive(:reset_session);   logout_keeping_session! end
-    it 'kills my auth_token cookie' do should_receive(:kill_remember_cookie!); logout_keeping_session! end
-    it 'nils the current user'      do logout_keeping_session!; current_user.should be_nil end
-    it 'kills :user_id session' do
-      session.stub!(:[]=)
-      session.should_receive(:[]=).with(:user_id, nil).at_least(:once)
-      logout_keeping_session!
-    end
-    it 'forgets me' do    
-      current_user.remember_me
-      current_user.remember_token.should_not be_nil; current_user.remember_token_expires_at.should_not be_nil
-      User.find(1).remember_token.should_not be_nil; User.find(1).remember_token_expires_at.should_not be_nil
-      logout_keeping_session!
-      User.find(1).remember_token.should     be_nil; User.find(1).remember_token_expires_at.should     be_nil
-    end
-  end
-  
-  describe 'When logged out' do 
-    it "should not be authorized?" do
-      authorized?().should be_false
-    end    
-  end
-
-  #
-  # Cookie Login
-  #
-  describe "Logging in by cookie" do
-    def set_remember_token token, time
-      @user[:remember_token]            = token; 
-      @user[:remember_token_expires_at] = time
-      @user.save!
-    end    
-    before do 
-      @user = User.find(:first); 
-      set_remember_token 'hello!', 5.minutes.from_now
-    end    
-    it 'logs in with cookie' do
-      stub!(:cookies).and_return({ :auth_token => 'hello!' })
-      logged_in?.should be_true
-    end
-    
-    it 'fails cookie login with bad cookie' do
-      should_receive(:cookies).at_least(:once).and_return({ :auth_token => 'i_haxxor_joo' })
-      logged_in?.should_not be_true
-    end
-    
-    it 'fails cookie login with no cookie' do
-      set_remember_token nil, nil
-      should_receive(:cookies).at_least(:once).and_return({ })
-      logged_in?.should_not be_true
-    end
-    
-    it 'fails expired cookie login' do
-      set_remember_token 'hello!', 5.minutes.ago
-      stub!(:cookies).and_return({ :auth_token => 'hello!' })
-      logged_in?.should_not be_true
-    end
-  end
-  
-end
diff --git a/spec/controllers/patient_controller_spec.rb b/spec/controllers/patient_controller_spec.rb
deleted file mode 100644
index 298984b3..00000000
--- a/spec/controllers/patient_controller_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-  
-describe PatientsController do
-  fixtures :patients
-
-  before( :each ) do
-    controller.stub!( :login_required )
-  end
-              
-  it 'allows patient creation' do
-    lambda do
-      create_patient
-    end.should change(Patient, :count).by(1)
-  end
-
-  it 'creates patient in active state' do
-    create_patient
-    assigns(:patient).reload
-    assigns(:patient).should be_active
-  end
-
-  it 'creates patient with no dunning stop' do
-    create_patient
-    assigns(:patient).reload
-    assigns(:patient).should_not be_dunning_stop
-  end
-
-  def create_patient(options = {})
-    post :create, :patient => { }.merge(options)
-  end
-end
-
-describe PatientsController do
-  describe "route generation" do
-    it "should route patients's 'index' action correctly" do
-      route_for(:controller => 'patients', :action => 'index').should == "/patients"
-    end
-    
-    it "should route {:controller => 'patients', :action => 'create'} correctly" do
-      route_for(:controller => 'patients', :action => 'create').should == "/patients"
-    end
-    
-    it "should route patients's 'show' action correctly" do
-      route_for(:controller => 'patients', :action => 'show', :id => '1').should == "/patients/1"
-    end
-    
-    it "should route patients's 'edit' action correctly" do
-      route_for(:controller => 'patients', :action => 'edit', :id => '1').should == "/patients/1/edit"
-    end
-    
-    it "should route patients's 'update' action correctly" do
-      route_for(:controller => 'patients', :action => 'update', :id => '1').should == "/patients/1"
-    end
-    
-    it "should route patients's 'destroy' action correctly" do
-      route_for(:controller => 'patients', :action => 'destroy', :id => '1').should == "/patients/1"
-    end
-  end
-  
-  describe "route recognition" do
-    it "should generate params for patients's index action from GET /patients" do
-      params_from(:get, '/patients').should == {:controller => 'patients', :action => 'index'}
-      params_from(:get, '/patients.xml').should == {:controller => 'patients', :action => 'index', :format => 'xml'}
-      params_from(:get, '/patients.json').should == {:controller => 'patients', :action => 'index', :format => 'json'}
-    end
-    
-    it "should generate params for patients's new action from GET /patients" do
-      params_from(:get, '/patients/new').should == {:controller => 'patients', :action => 'new'}
-      params_from(:get, '/patients/new.xml').should == {:controller => 'patients', :action => 'new', :format => 'xml'}
-      params_from(:get, '/patients/new.json').should == {:controller => 'patients', :action => 'new', :format => 'json'}
-    end
-    
-    it "should generate params for patients's create action from POST /patients" do
-      params_from(:post, '/patients').should == {:controller => 'patients', :action => 'create'}
-      params_from(:post, '/patients.xml').should == {:controller => 'patients', :action => 'create', :format => 'xml'}
-      params_from(:post, '/patients.json').should == {:controller => 'patients', :action => 'create', :format => 'json'}
-    end
-    
-    it "should generate params for patients's show action from GET /patients/1" do
-      params_from(:get , '/patients/1').should == {:controller => 'patients', :action => 'show', :id => '1'}
-      params_from(:get , '/patients/1.xml').should == {:controller => 'patients', :action => 'show', :id => '1', :format => 'xml'}
-      params_from(:get , '/patients/1.json').should == {:controller => 'patients', :action => 'show', :id => '1', :format => 'json'}
-    end
-    
-    it "should generate params for patients's edit action from GET /patients/1/edit" do
-      params_from(:get , '/patients/1/edit').should == {:controller => 'patients', :action => 'edit', :id => '1'}
-    end
-    
-    it "should generate params {:controller => 'patients', :action => update', :id => '1'} from PUT /patients/1" do
-      params_from(:put , '/patients/1').should == {:controller => 'patients', :action => 'update', :id => '1'}
-      params_from(:put , '/patients/1.xml').should == {:controller => 'patients', :action => 'update', :id => '1', :format => 'xml'}
-      params_from(:put , '/patients/1.json').should == {:controller => 'patients', :action => 'update', :id => '1', :format => 'json'}
-    end
-    
-    it "should generate params for patients's destroy action from DELETE /patients/1" do
-      params_from(:delete, '/patients/1').should == {:controller => 'patients', :action => 'destroy', :id => '1'}
-      params_from(:delete, '/patients/1.xml').should == {:controller => 'patients', :action => 'destroy', :id => '1', :format => 'xml'}
-      params_from(:delete, '/patients/1.json').should == {:controller => 'patients', :action => 'destroy', :id => '1', :format => 'json'}
-    end
-  end
-  
-  describe "named routing" do
-    before(:each) do
-      get :new
-    end
-    
-    it "should route patients_path() to /patients" do
-      patients_path().should == "/patients"
-      formatted_patients_path(:format => 'xml').should == "/patients.xml"
-      formatted_patients_path(:format => 'json').should == "/patients.json"
-    end
-    
-    it "should route new_patient_path() to /patients/new" do
-      new_patient_path().should == "/patients/new"
-      formatted_new_patient_path(:format => 'xml').should == "/patients/new.xml"
-      formatted_new_patient_path(:format => 'json').should == "/patients/new.json"
-    end
-    
-    it "should route patient_(:id => '1') to /patients/1" do
-      patient_path(:id => '1').should == "/patients/1"
-      formatted_patient_path(:id => '1', :format => 'xml').should == "/patients/1.xml"
-      formatted_patient_path(:id => '1', :format => 'json').should == "/patients/1.json"
-    end
-    
-    it "should route edit_patient_path(:id => '1') to /patients/1/edit" do
-      edit_patient_path(:id => '1').should == "/patients/1/edit"
-    end
-  end
-  
-end
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
deleted file mode 100644
index 75d5d69e..00000000
--- a/spec/controllers/sessions_controller_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-# Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead
-# Then, you can remove it from this and the units test.
-include AuthenticatedTestHelper
-
-describe SessionsController do
-  fixtures        :users
-  before do 
-    @user  = mock_user
-    @login_params = { :login => 'quentin', :password => 'test' }
-    User.stub!(:authenticate).with(@login_params[:login], @login_params[:password]).and_return(@user)
-  end
-  def do_create
-    post :create, @login_params
-  end
-  describe "on successful login," do
-    [ [:nil,       nil,            nil],
-      [:expired,   'valid_token',  15.minutes.ago],
-      [:different, 'i_haxxor_joo', 15.minutes.from_now], 
-      [:valid,     'valid_token',  15.minutes.from_now]
-        ].each do |has_request_token, token_value, token_expiry|
-      [ true, false ].each do |want_remember_me|
-        describe "my request cookie token is #{has_request_token.to_s}," do
-          describe "and ask #{want_remember_me ? 'to' : 'not to'} be remembered" do 
-            before do
-              @ccookies = mock('cookies')
-              controller.stub!(:cookies).and_return(@ccookies)
-              @ccookies.stub!(:[]).with(:auth_token).and_return(token_value)
-              @ccookies.stub!(:delete).with(:auth_token)
-              @ccookies.stub!(:[]=)
-              @user.stub!(:remember_me) 
-              @user.stub!(:refresh_token) 
-              @user.stub!(:forget_me)
-              @user.stub!(:remember_token).and_return(token_value) 
-              @user.stub!(:remember_token_expires_at).and_return(token_expiry)
-              @user.stub!(:remember_token?).and_return(has_request_token == :valid)
-              if want_remember_me
-                @login_params[:remember_me] = '1'
-              else 
-                @login_params[:remember_me] = '0'
-              end
-            end
-            it "kills existing login"        do controller.should_receive(:logout_keeping_session!); do_create; end    
-            it "authorizes me"               do do_create; controller.send(:authorized?).should be_true;   end    
-            it "logs me in"                  do do_create; controller.send(:logged_in?).should  be_true  end    
-            it "greets me nicely"            do do_create; response.flash[:notice].should =~ /success/i   end
-            it "sets/resets/expires cookie"  do controller.should_receive(:handle_remember_cookie!).with(want_remember_me); do_create end
-            it "sends a cookie"              do controller.should_receive(:send_remember_cookie!);  do_create end
-            it 'redirects to the home page'  do do_create; response.should redirect_to('/')   end
-            it "does not reset my session"   do controller.should_not_receive(:reset_session).and_return nil; do_create end # change if you uncomment the reset_session path
-            if (has_request_token == :valid)
-              it 'does not make new token'   do @user.should_not_receive(:remember_me);   do_create end
-              it 'does refresh token'        do @user.should_receive(:refresh_token);     do_create end 
-              it "sets an auth cookie"       do do_create;  end
-            else
-              if want_remember_me
-                it 'makes a new token'       do @user.should_receive(:remember_me);       do_create end 
-                it "does not refresh token"  do @user.should_not_receive(:refresh_token); do_create end
-                it "sets an auth cookie"       do do_create;  end
-              else 
-                it 'does not make new token' do @user.should_not_receive(:remember_me);   do_create end
-                it 'does not refresh token'  do @user.should_not_receive(:refresh_token); do_create end 
-                it 'kills user token'        do @user.should_receive(:forget_me);         do_create end 
-              end
-            end
-          end # inner describe
-        end
-      end
-    end
-  end
-  
-  describe "on failed login" do
-    before do
-      User.should_receive(:authenticate).with(anything(), anything()).and_return(nil)
-      login_as :quentin
-    end
-    it 'logs out keeping session'   do controller.should_receive(:logout_keeping_session!); do_create end
-    it 'flashes an error'           do do_create; flash[:error].should =~ /Couldn't log you in as 'quentin'/ end
-    it 'renders the log in page'    do do_create; response.should render_template('new')  end
-    it "doesn't log me in"          do do_create; controller.send(:logged_in?).should == false end
-    it "doesn't send password back" do 
-      @login_params[:password] = 'FROBNOZZ'
-      do_create
-      response.should_not have_text(/FROBNOZZ/i)
-    end
-  end
-
-  describe "on signout" do
-    def do_destroy
-      get :destroy
-    end
-    before do 
-      login_as :quentin
-    end
-    it 'logs me out'                   do controller.should_receive(:logout_killing_session!); do_destroy end
-    it 'redirects me to the home page' do do_destroy; response.should be_redirect     end
-  end
-  
-end
-
-describe SessionsController do
-  describe "route generation" do
-    it "should route the new sessions action correctly" do
-      route_for(:controller => 'sessions', :action => 'new').should == "/login"
-    end
-    it "should route the create sessions correctly" do
-      route_for(:controller => 'sessions', :action => 'create').should == "/session"
-    end
-    it "should route the destroy sessions action correctly" do
-      route_for(:controller => 'sessions', :action => 'destroy').should == "/logout"
-    end
-  end
-  
-  describe "route recognition" do
-    it "should generate params from GET /login correctly" do
-      params_from(:get, '/login').should == {:controller => 'sessions', :action => 'new'}
-    end
-    it "should generate params from POST /session correctly" do
-      params_from(:post, '/session').should == {:controller => 'sessions', :action => 'create'}
-    end
-    it "should generate params from DELETE /session correctly" do
-      params_from(:delete, '/logout').should == {:controller => 'sessions', :action => 'destroy'}
-    end
-  end
-  
-  describe "named routing" do
-    before(:each) do
-      get :new
-    end
-    it "should route session_path() correctly" do
-      session_path().should == "/session"
-    end
-    it "should route new_session_path() correctly" do
-      new_session_path().should == "/session/new"
-    end
-  end
-  
-end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
deleted file mode 100644
index 69e10ba6..00000000
--- a/spec/controllers/users_controller_spec.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-  
-# Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead
-# Then, you can remove it from this and the units test.
-include AuthenticatedTestHelper
-
-describe UsersController do
-  fixtures :users
-
-  it 'allows signup' do
-    lambda do
-      create_user
-      response.should be_redirect
-    end.should change(User, :count).by(1)
-  end
-
-  
-  it 'signs up user in pending state' do
-    create_user
-    assigns(:user).reload
-    assigns(:user).should be_pending
-  end
-
-  it 'signs up user with activation code' do
-    create_user
-    assigns(:user).reload
-    assigns(:user).activation_code.should_not be_nil
-  end
-  it 'requires login on signup' do
-    lambda do
-      create_user(:login => nil)
-      assigns[:user].errors.on(:login).should_not be_nil
-      response.should be_success
-    end.should_not change(User, :count)
-  end
-  
-  it 'requires password on signup' do
-    lambda do
-      create_user(:password => nil)
-      assigns[:user].errors.on(:password).should_not be_nil
-      response.should be_success
-    end.should_not change(User, :count)
-  end
-  
-  it 'requires password confirmation on signup' do
-    lambda do
-      create_user(:password_confirmation => nil)
-      assigns[:user].errors.on(:password_confirmation).should_not be_nil
-      response.should be_success
-    end.should_not change(User, :count)
-  end
-
-  it 'requires email on signup' do
-    lambda do
-      create_user(:email => nil)
-      assigns[:user].errors.on(:email).should_not be_nil
-      response.should be_success
-    end.should_not change(User, :count)
-  end
-  
-  
-  it 'activates user' do
-    User.authenticate('aaron', 'monkey').should be_nil
-    get :activate, :activation_code => users(:aaron).activation_code
-    response.should redirect_to('/login')
-    flash[:notice].should_not be_nil
-    flash[:error ].should     be_nil
-    User.authenticate('aaron', 'monkey').should == users(:aaron)
-  end
-  
-  it 'does not activate user without key' do
-    get :activate
-    flash[:notice].should     be_nil
-    flash[:error ].should_not be_nil
-  end
-  
-  it 'does not activate user with blank key' do
-    get :activate, :activation_code => ''
-    flash[:notice].should     be_nil
-    flash[:error ].should_not be_nil
-  end
-  
-  it 'does not activate user with bogus key' do
-    get :activate, :activation_code => 'i_haxxor_joo'
-    flash[:notice].should     be_nil
-    flash[:error ].should_not be_nil
-  end
-  
-  def create_user(options = {})
-    post :create, :user => { :login => 'quire', :email => 'quire@example.com',
-      :password => 'quire69', :password_confirmation => 'quire69' }.merge(options)
-  end
-end
-
-describe UsersController do
-  describe "route generation" do
-    it "should route users's 'index' action correctly" do
-      route_for(:controller => 'users', :action => 'index').should == "/users"
-    end
-    
-    it "should route users's 'new' action correctly" do
-      route_for(:controller => 'users', :action => 'new').should == "/signup"
-    end
-    
-    it "should route {:controller => 'users', :action => 'create'} correctly" do
-      route_for(:controller => 'users', :action => 'create').should == "/register"
-    end
-    
-    it "should route users's 'show' action correctly" do
-      route_for(:controller => 'users', :action => 'show', :id => '1').should == "/users/1"
-    end
-    
-    it "should route users's 'edit' action correctly" do
-      route_for(:controller => 'users', :action => 'edit', :id => '1').should == "/users/1/edit"
-    end
-    
-    it "should route users's 'update' action correctly" do
-      route_for(:controller => 'users', :action => 'update', :id => '1').should == "/users/1"
-    end
-    
-    it "should route users's 'destroy' action correctly" do
-      route_for(:controller => 'users', :action => 'destroy', :id => '1').should == "/users/1"
-    end
-  end
-  
-  describe "route recognition" do
-    it "should generate params for users's index action from GET /users" do
-      params_from(:get, '/users').should == {:controller => 'users', :action => 'index'}
-      params_from(:get, '/users.xml').should == {:controller => 'users', :action => 'index', :format => 'xml'}
-      params_from(:get, '/users.json').should == {:controller => 'users', :action => 'index', :format => 'json'}
-    end
-    
-    it "should generate params for users's new action from GET /users" do
-      params_from(:get, '/users/new').should == {:controller => 'users', :action => 'new'}
-      params_from(:get, '/users/new.xml').should == {:controller => 'users', :action => 'new', :format => 'xml'}
-      params_from(:get, '/users/new.json').should == {:controller => 'users', :action => 'new', :format => 'json'}
-    end
-    
-    it "should generate params for users's create action from POST /users" do
-      params_from(:post, '/users').should == {:controller => 'users', :action => 'create'}
-      params_from(:post, '/users.xml').should == {:controller => 'users', :action => 'create', :format => 'xml'}
-      params_from(:post, '/users.json').should == {:controller => 'users', :action => 'create', :format => 'json'}
-    end
-    
-    it "should generate params for users's show action from GET /users/1" do
-      params_from(:get , '/users/1').should == {:controller => 'users', :action => 'show', :id => '1'}
-      params_from(:get , '/users/1.xml').should == {:controller => 'users', :action => 'show', :id => '1', :format => 'xml'}
-      params_from(:get , '/users/1.json').should == {:controller => 'users', :action => 'show', :id => '1', :format => 'json'}
-    end
-    
-    it "should generate params for users's edit action from GET /users/1/edit" do
-      params_from(:get , '/users/1/edit').should == {:controller => 'users', :action => 'edit', :id => '1'}
-    end
-    
-    it "should generate params {:controller => 'users', :action => update', :id => '1'} from PUT /users/1" do
-      params_from(:put , '/users/1').should == {:controller => 'users', :action => 'update', :id => '1'}
-      params_from(:put , '/users/1.xml').should == {:controller => 'users', :action => 'update', :id => '1', :format => 'xml'}
-      params_from(:put , '/users/1.json').should == {:controller => 'users', :action => 'update', :id => '1', :format => 'json'}
-    end
-    
-    it "should generate params for users's destroy action from DELETE /users/1" do
-      params_from(:delete, '/users/1').should == {:controller => 'users', :action => 'destroy', :id => '1'}
-      params_from(:delete, '/users/1.xml').should == {:controller => 'users', :action => 'destroy', :id => '1', :format => 'xml'}
-      params_from(:delete, '/users/1.json').should == {:controller => 'users', :action => 'destroy', :id => '1', :format => 'json'}
-    end
-  end
-  
-  describe "named routing" do
-    before(:each) do
-      get :new
-    end
-    
-    it "should route users_path() to /users" do
-      users_path().should == "/users"
-      formatted_users_path(:format => 'xml').should == "/users.xml"
-      formatted_users_path(:format => 'json').should == "/users.json"
-    end
-    
-    it "should route new_user_path() to /users/new" do
-      new_user_path().should == "/users/new"
-      formatted_new_user_path(:format => 'xml').should == "/users/new.xml"
-      formatted_new_user_path(:format => 'json').should == "/users/new.json"
-    end
-    
-    it "should route user_(:id => '1') to /users/1" do
-      user_path(:id => '1').should == "/users/1"
-      formatted_user_path(:id => '1', :format => 'xml').should == "/users/1.xml"
-      formatted_user_path(:id => '1', :format => 'json').should == "/users/1.json"
-    end
-    
-    it "should route edit_user_path(:id => '1') to /users/1/edit" do
-      edit_user_path(:id => '1').should == "/users/1/edit"
-    end
-  end
-  
-end
diff --git a/spec/controllers/welcome_controller_spec.rb b/spec/controllers/welcome_controller_spec.rb
deleted file mode 100644
index aed419fa..00000000
--- a/spec/controllers/welcome_controller_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-  
-include AuthenticatedTestHelper
-
-describe WelcomeController do
-  fixtures :users, :doctors
-
-  describe "for anonymous users" do
-    it 'should redirect to login page' do
-      get :index
-      response.should redirect_to('/session/new')
-    end
-  end
-
-  describe "for logged in test user" do
-    before( :each ) do
-      login_as :test
-    end
-
-    it 'should render index page' do
-      get :index
-      response.should be_success
-      response.should render_template('welcome/index')
-    end
-  end
-
-  describe "for logged in users" do
-    before( :each ) do
-      controller.stub!( :login_required )
-    end
-
-    it 'should render index page' do
-      get :index
-      response.should be_success
-      response.should render_template('welcome/index')
-    end
-  end
-end
-
-describe WelcomeController do
-  describe "route generation" do
-    it "should route welcome's 'index' action correctly" do
-      route_for(:controller => 'welcome', :action => 'index').should == "/"
-    end
-  end
-  
-  describe "route recognition" do
-    it "should generate params for welcome's index action from GET /" do
-      params_from(:get, '/').should == {:controller => 'welcome', :action => 'index'}
-    end
-  end
-end
diff --git a/spec/fixtures/doctors.yml b/spec/fixtures/doctors.yml
deleted file mode 100644
index 13b49a97..00000000
--- a/spec/fixtures/doctors.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-test:
-  login: test
-  praxis: doctor_test
-  zsr: R12.1111
-  ean_party: 1122334455667
-  account: test_account
-
-single:
-  login: $LABEL
-  praxis: doctor_test
-  zsr: R12.2222
-  ean_party: 1122334455667
-
-colleague_one:
-  login: colleague
-  praxis: doctor_test
-  zsr: R12.3333
-  ean_party: 9911223344556
diff --git a/spec/fixtures/users.yml b/spec/fixtures/users.yml
deleted file mode 100644
index d69ba97c..00000000
--- a/spec/fixtures/users.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-test:
-  login:                     test
-  email:                     test@example.com
-  salt:                      356a192b7913b04c54574d18c28d46e6395428ab # SHA1('0')
-  crypted_password:          8a32cac8bbbe7162bf2ea55879122d1beebed1e9 # 'monkey'
-  state:                     active
-
-quentin:
-  id:                        1
-  login:                     quentin
-  email:                     quentin@example.com
-  salt:                      356a192b7913b04c54574d18c28d46e6395428ab # SHA1('0')
-  crypted_password:          8a32cac8bbbe7162bf2ea55879122d1beebed1e9 # 'monkey'
-  created_at:                <%= 5.days.ago.to_s :db  %>
-  remember_token_expires_at: <%= 1.days.from_now.to_s %>
-  remember_token:            77de68daecd823babbb58edb1c8e14d7106e83bb
-  activation_code:           
-  activated_at:              <%= 5.days.ago.to_s :db %>
-  state:                     active
-      
-aaron:
-  id:                        2
-  login:                     aaron
-  email:                     aaron@example.com
-  salt:                      da4b9237bacccdf19c0760cab7aec4a8359010b0 # SHA1('1')
-  crypted_password:          695bed22fb41b1dac9e715cd90dd5b6e1a6f96e5 # 'monkey'
-  created_at:                <%= 1.days.ago.to_s :db %>
-  remember_token_expires_at: 
-  remember_token:            
-  activation_code:           1b6453892473a467d07372d45eb05abc2031647a
-  activated_at:              
-
-  state:                     pending
-
-
-old_password_holder:
-  id:                        3
-  login:                     old_password_holder
-  email:                     salty_dog@example.com
-  salt:                      7e3041ebc2fc05a40c60028e2c4901a81035d3cd
-  crypted_password:          00742970dc9e6319f8019fd54864d3ea740f04b1 # test
-  created_at:                <%= 1.days.ago.to_s :db %>
-
-  activation_code:           
-  activated_at:              <%= 5.days.ago.to_s :db %>
-
-
-  state:                     active
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
deleted file mode 100644
index 30648781..00000000
--- a/spec/helpers/users_helper_spec.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-include ApplicationHelper
-include UsersHelper
-include AuthenticatedTestHelper
-
-describe UsersHelper do
-  before do
-    @user = mock_user
-  end
-  
-  describe "if_authorized" do 
-    it "yields if authorized" do
-      should_receive(:authorized?).with('a','r').and_return(true)
-      if_authorized?('a','r'){|action,resource| [action,resource,'hi'] }.should == ['a','r','hi']
-    end
-    it "does nothing if not authorized" do
-      should_receive(:authorized?).with('a','r').and_return(false)
-      if_authorized?('a','r'){ 'hi' }.should be_nil
-    end
-  end
-  
-  describe "link_to_user" do
-    it "should give an error on a nil user" do
-      lambda { link_to_user(nil) }.should raise_error('Invalid user')
-    end
-    it "should link to the given user" do
-      should_receive(:user_path).at_least(:once).and_return('/users/1')
-      link_to_user(@user).should have_tag("a[href='/users/1']")
-    end
-    it "should use given link text if :content_text is specified" do
-      link_to_user(@user, :content_text => 'Hello there!').should have_tag("a", 'Hello there!')
-    end
-    it "should use the login as link text with no :content_method specified" do
-      link_to_user(@user).should have_tag("a", 'user_name')
-    end
-    it "should use the name as link text with :content_method => :name" do
-      link_to_user(@user, :content_method => :name).should have_tag("a", 'U. Surname')
-    end
-    it "should use the login as title with no :title_method specified" do
-      link_to_user(@user).should have_tag("a[title='user_name']")
-    end
-    it "should use the name as link title with :content_method => :name" do
-      link_to_user(@user, :title_method => :name).should have_tag("a[title='U. Surname']")
-    end
-    it "should have nickname as a class by default" do
-      link_to_user(@user).should have_tag("a.nickname")
-    end
-    it "should take other classes and no longer have the nickname class" do
-      result = link_to_user(@user, :class => 'foo bar')
-      result.should have_tag("a.foo")
-      result.should have_tag("a.bar")
-    end
-  end
-
-  describe "link_to_login_with_IP" do
-    it "should link to the login_path" do
-      link_to_login_with_IP().should have_tag("a[href='/login']")
-    end
-    it "should use given link text if :content_text is specified" do
-      link_to_login_with_IP('Hello there!').should have_tag("a", 'Hello there!')
-    end
-    it "should use the login as link text with no :content_method specified" do
-      link_to_login_with_IP().should have_tag("a", '0.0.0.0')
-    end
-    it "should use the ip address as title" do
-      link_to_login_with_IP().should have_tag("a[title='0.0.0.0']")
-    end
-    it "should by default be like school in summer and have no class" do
-      link_to_login_with_IP().should_not have_tag("a.nickname")
-    end
-    it "should have some class if you tell it to" do
-      result = link_to_login_with_IP(nil, :class => 'foo bar')
-      result.should have_tag("a.foo")
-      result.should have_tag("a.bar")
-    end
-    it "should have some class if you tell it to" do
-      result = link_to_login_with_IP(nil, :tag => 'abbr')
-      result.should have_tag("abbr[title='0.0.0.0']")
-    end
-  end
-
-  describe "link_to_current_user, When logged in" do
-    before do
-      stub!(:current_user).and_return(@user)
-    end
-    it "should link to the given user" do
-      should_receive(:user_path).at_least(:once).and_return('/users/1')
-      link_to_current_user().should have_tag("a[href='/users/1']")
-    end
-    it "should use given link text if :content_text is specified" do
-      link_to_current_user(:content_text => 'Hello there!').should have_tag("a", 'Hello there!')
-    end
-    it "should use the login as link text with no :content_method specified" do
-      link_to_current_user().should have_tag("a", 'user_name')
-    end
-    it "should use the name as link text with :content_method => :name" do
-      link_to_current_user(:content_method => :name).should have_tag("a", 'U. Surname')
-    end
-    it "should use the login as title with no :title_method specified" do
-      link_to_current_user().should have_tag("a[title='user_name']")
-    end
-    it "should use the name as link title with :content_method => :name" do
-      link_to_current_user(:title_method => :name).should have_tag("a[title='U. Surname']")
-    end
-    it "should have nickname as a class" do
-      link_to_current_user().should have_tag("a.nickname")
-    end
-    it "should take other classes and no longer have the nickname class" do
-      result = link_to_current_user(:class => 'foo bar')
-      result.should have_tag("a.foo")
-      result.should have_tag("a.bar")
-    end
-  end
-
-  describe "link_to_current_user, When logged out" do
-    before do
-      stub!(:current_user).and_return(nil)
-    end
-    it "should link to the login_path" do
-      link_to_current_user().should have_tag("a[href='/login']")
-    end
-    it "should use given link text if :content_text is specified" do
-      link_to_current_user(:content_text => 'Hello there!').should have_tag("a", 'Hello there!')
-    end
-    it "should use 'not signed in' as link text with no :content_method specified" do
-      link_to_current_user().should have_tag("a", 'not signed in')
-    end
-    it "should use the ip address as title" do
-      link_to_current_user().should have_tag("a[title='0.0.0.0']")
-    end
-    it "should by default be like school in summer and have no class" do
-      link_to_current_user().should_not have_tag("a.nickname")
-    end
-    it "should have some class if you tell it to" do
-      result = link_to_current_user(:class => 'foo bar')
-      result.should have_tag("a.foo")
-      result.should have_tag("a.bar")
-    end
-  end
-
-end
diff --git a/spec/models/doctor_spec.rb b/spec/models/doctor_spec.rb
deleted file mode 100644
index d5c94bf3..00000000
--- a/spec/models/doctor_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Doctor do
-  fixtures :doctors
-
-  describe 'being created' do
-    before do
-      @doctor = nil
-      @creating_doctor = lambda do
-        @doctor = create_doctor
-        violated "#{@doctor.errors.full_messages.to_sentence}" if @doctor.new_record?
-      end
-    end
-
-    it 'increments Doctor#count' do
-      @creating_doctor.should change(Doctor, :count).by(1)
-    end
-
-    it 'starts in active state' do
-      @creating_doctor.call
-      @doctor.reload
-      @doctor.should be_active
-    end
-  end
-  
-  describe 'should sanitize valid ZSR:' do
-    ['R777777', 'R77.7777', 'R 77.7777'
-    ].each do |zsr_str|
-      it zsr_str do
-        @doctor = create_doctor
-        @doctor.zsr = zsr_str
-        @doctor.zsr.should == 'R777777'
-      end
-    end
-  end
-
-  describe 'should return valid name' do
-    it "using login when no praxis set" do
-      doctor = doctors(:test)
-      doctor.name.should == doctor.login
-    end
-  end
-
-  # Validations
-protected
-  def create_doctor(options = {})
-    record = Doctor.new({ :login => 'quire' }.merge(options))
-    record.save! if record.valid?
-    record
-  end
-end
diff --git a/spec/models/patient_spec.rb b/spec/models/patient_spec.rb
deleted file mode 100644
index 10492233..00000000
--- a/spec/models/patient_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Patient do
-  describe 'being created' do
-    before do
-      @patient = nil
-      @creating_patient = lambda do
-        @patient = create_patient
-        violated "#{@patient.errors.full_messages.to_sentence}" if @patient.new_record?
-      end
-    end
-
-    it 'increments Patient#count' do
-      @creating_patient.should change(Patient, :count).by(1)
-    end
-
-    it 'starts in active state' do
-      @creating_patient.call
-      @patient.should be_active
-    end
-
-    it 'takes some arguments' do
-      @patient = create_patient(
-        :birth_date => '1998-02-05',
-        :sex => 2,
-        :remarks => 'Just a simple test patient. Äuä scho no öppis!!!',
-        :doctor_patient_nr => 'a777.7',
-        :name => 'Ursina Wiederkehr'
-      )
-      @patient.birth_date.should == Date.parse('1998-02-05')
-      @patient.sex.should == 'F'
-      @patient.doctor_patient_nr == 'a777.7'
-      @patient.name == 'Ursina Wiederkehr'
-    end
-
-    it 'should have sane defaults' do
-      @patient = create_patient
-      @patient.stub!(:find).and_return @patient
-      @patient.reload
-      @patient.should_not be_dunning_stop
-      @patient.should_not be_use_billing_address
-      @patient.should_not be_deceased
-      @patient.should be_active
-    end
-  end
-
-  # Validations
-protected
-  def create_patient(options = {})
-    record = Patient.new({ }.merge(options))
-    record.save! if record.valid?
-    record
-  end
-end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
deleted file mode 100644
index 6b23b0e0..00000000
--- a/spec/models/user_spec.rb
+++ /dev/null
@@ -1,291 +0,0 @@
-# -*- encoding : utf-8 -*-
-# -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-# Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead.
-# Then, you can remove it from this and the functional test.
-include AuthenticatedTestHelper
-
-describe User do
-  fixtures :users
-
-  describe 'being created' do
-    before do
-      @user = nil
-      @creating_user = lambda do
-        @user = create_user
-        violated "#{@user.errors.full_messages.to_sentence}" if @user.new_record?
-      end
-    end
-
-    it 'increments User#count' do
-      @creating_user.should change(User, :count).by(1)
-    end
-
-    it 'initializes #activation_code' do
-      @creating_user.call
-      @user.reload
-      @user.activation_code.should_not be_nil
-    end
-
-    it 'starts in pending state' do
-      @creating_user.call
-      @user.reload
-      @user.should be_pending
-    end
-  end
-
-  #
-  # Validations
-  #
-
-  it 'requires login' do
-    lambda do
-      u = create_user(:login => nil)
-      u.errors.on(:login).should_not be_nil
-    end.should_not change(User, :count)
-  end
-
-  describe 'allows legitimate logins:' do
-    ['12', '1234567890_234567890_234567890_234567890',
-     'hello.-_there@funnychar.com'].each do |login_str|
-      it "'#{login_str}'" do
-        lambda do
-          u = create_user(:login => login_str)
-          u.errors.on(:login).should     be_nil
-        end.should change(User, :count).by(1)
-      end
-    end
-  end
-  describe 'disallows illegitimate logins:' do
-    ['1', '1234567890_234567890_234567890_234567890_', "tab\t", "newline\n",
-     "Iñtërnâtiônàlizætiøn hasn't happened to ruby 1.8 yet",
-     'semicolon;', 'quote"', 'tick\'', 'backtick`', 'percent%', 'plus+', 'space '].each do |login_str|
-      it "'#{login_str}'" do
-        lambda do
-          u = create_user(:login => login_str)
-          u.errors.on(:login).should_not be_nil
-        end.should_not change(User, :count)
-      end
-    end
-  end
-
-  it 'requires password' do
-    lambda do
-      u = create_user(:password => nil)
-      u.errors.on(:password).should_not be_nil
-    end.should_not change(User, :count)
-  end
-
-  it 'requires password confirmation' do
-    lambda do
-      u = create_user(:password_confirmation => nil)
-      u.errors.on(:password_confirmation).should_not be_nil
-    end.should_not change(User, :count)
-  end
-
-  it 'requires email' do
-    lambda do
-      u = create_user(:email => nil)
-      u.errors.on(:email).should_not be_nil
-    end.should_not change(User, :count)
-  end
-
-  describe 'allows legitimate emails:' do
-    ['foo@bar.com', 'foo@newskool-tld.museum', 'foo@twoletter-tld.de', 'foo@nonexistant-tld.qq',
-     'r@a.wk', '1234567890-234567890-234567890-234567890-234567890-234567890-234567890-234567890-234567890@gmail.com',
-     'hello.-_there@funnychar.com', 'uucp%addr@gmail.com', 'hello+routing-str@gmail.com',
-     'domain@can.haz.many.sub.doma.in', 'student.name@university.edu'
-    ].each do |email_str|
-      it "'#{email_str}'" do
-        lambda do
-          u = create_user(:email => email_str)
-          u.errors.on(:email).should     be_nil
-        end.should change(User, :count).by(1)
-      end
-    end
-  end
-  describe 'disallows illegitimate emails' do
-    ['!!@nobadchars.com', 'foo@no-rep-dots..com', 'foo@badtld.xxx', 'foo@toolongtld.abcdefg',
-     'Iñtërnâtiônàlizætiøn@hasnt.happened.to.email', 'need.domain.and.tld@de', "tab\t", "newline\n",
-     'r@.wk', '1234567890-234567890-234567890-234567890-234567890-234567890-234567890-234567890-234567890@gmail2.com',
-     # these are technically allowed but not seen in practice:
-     'uucp!addr@gmail.com', 'semicolon;@gmail.com', 'quote"@gmail.com', 'tick\'@gmail.com', 'backtick`@gmail.com', 'space @gmail.com', 'bracket<@gmail.com', 'bracket>@gmail.com'
-    ].each do |email_str|
-      it "'#{email_str}'" do
-        lambda do
-          u = create_user(:email => email_str)
-          u.errors.on(:email).should_not be_nil
-        end.should_not change(User, :count)
-      end
-    end
-  end
-
-  describe 'allows legitimate names:' do
-    ['Andre The Giant (7\'4", 520 lb.) -- has a posse',
-     '', '1234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890',
-    ].each do |name_str|
-      it "'#{name_str}'" do
-        lambda do
-          u = create_user(:name => name_str)
-          u.errors.on(:name).should     be_nil
-        end.should change(User, :count).by(1)
-      end
-    end
-  end
-  describe "disallows illegitimate names" do
-    ["tab\t", "newline\n",
-     '1234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890_234567890_',
-     ].each do |name_str|
-      it "'#{name_str}'" do
-        lambda do
-          u = create_user(:name => name_str)
-          u.errors.on(:name).should_not be_nil
-        end.should_not change(User, :count)
-      end
-    end
-  end
-
-  it 'resets password' do
-    users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password')
-    User.authenticate('quentin', 'new password').should == users(:quentin)
-  end
-
-  it 'does not rehash password' do
-    users(:quentin).update_attributes(:login => 'quentin2')
-    User.authenticate('quentin2', 'monkey').should == users(:quentin)
-  end
-
-  #
-  # Authentication
-  #
-
-  it 'authenticates user' do
-    User.authenticate('quentin', 'monkey').should == users(:quentin)
-  end
-
-  it "doesn't authenticate user with bad password" do
-    User.authenticate('quentin', 'invalid_password').should be_nil
-  end
-
- if REST_AUTH_SITE_KEY.blank?
-   # old-school passwords
-   it "authenticates a user against a hard-coded old-style password" do
-     User.authenticate('old_password_holder', 'test').should == users(:old_password_holder)
-   end
- else
-   it "doesn't authenticate a user against a hard-coded old-style password" do
-     User.authenticate('old_password_holder', 'test').should be_nil
-   end
-
-   # New installs should bump this up and set REST_AUTH_DIGEST_STRETCHES to give a 10ms encrypt time or so
-   desired_encryption_expensiveness_ms = 0.1
-   it "takes longer than #{desired_encryption_expensiveness_ms}ms to encrypt a password" do
-     test_reps = 100
-     start_time = Time.now; test_reps.times{ User.authenticate('quentin', 'monkey'+rand.to_s) }; end_time   = Time.now
-     auth_time_ms = 1000 * (end_time - start_time)/test_reps
-     auth_time_ms.should > desired_encryption_expensiveness_ms
-   end
- end
-
-  #
-  # Authentication
-  #
-
-  it 'sets remember token' do
-    users(:quentin).remember_me
-    users(:quentin).remember_token.should_not be_nil
-    users(:quentin).remember_token_expires_at.should_not be_nil
-  end
-
-  it 'unsets remember token' do
-    users(:quentin).remember_me
-    users(:quentin).remember_token.should_not be_nil
-    users(:quentin).forget_me
-    users(:quentin).remember_token.should be_nil
-  end
-
-  it 'remembers me for one week' do
-    before = 1.week.from_now.utc
-    users(:quentin).remember_me_for 1.week
-    after = 1.week.from_now.utc
-    users(:quentin).remember_token.should_not be_nil
-    users(:quentin).remember_token_expires_at.should_not be_nil
-    users(:quentin).remember_token_expires_at.between?(before, after).should be_true
-  end
-
-  it 'remembers me until one week' do
-    time = 1.week.from_now.utc
-    users(:quentin).remember_me_until time
-    users(:quentin).remember_token.should_not be_nil
-    users(:quentin).remember_token_expires_at.should_not be_nil
-    users(:quentin).remember_token_expires_at.should == time
-  end
-
-  it 'remembers me default two weeks' do
-    before = 2.weeks.from_now.utc
-    users(:quentin).remember_me
-    after = 2.weeks.from_now.utc
-    users(:quentin).remember_token.should_not be_nil
-    users(:quentin).remember_token_expires_at.should_not be_nil
-    users(:quentin).remember_token_expires_at.between?(before, after).should be_true
-  end
-
-  it 'registers passive user' do
-    user = create_user(:password => nil, :password_confirmation => nil)
-    user.should be_passive
-    user.update_attributes(:password => 'new password', :password_confirmation => 'new password')
-    user.register!
-    user.should be_pending
-  end
-
-  it 'suspends user' do
-    users(:quentin).suspend!
-    users(:quentin).should be_suspended
-  end
-
-  it 'does not authenticate suspended user' do
-    users(:quentin).suspend!
-    User.authenticate('quentin', 'monkey').should_not == users(:quentin)
-  end
-
-  it 'deletes user' do
-    users(:quentin).deleted_at.should be_nil
-    users(:quentin).delete!
-    users(:quentin).deleted_at.should_not be_nil
-    users(:quentin).should be_deleted
-  end
-
-  describe "being unsuspended" do
-    fixtures :users
-
-    before do
-      @user = users(:quentin)
-      @user.suspend!
-    end
-
-    it 'reverts to active state' do
-      @user.unsuspend!
-      @user.should be_active
-    end
-
-    it 'reverts to passive state if activation_code and activated_at are nil' do
-      User.update_all :activation_code => nil, :activated_at => nil
-      @user.reload.unsuspend!
-      @user.should be_passive
-    end
-
-    it 'reverts to pending state if activation_code is set and activated_at is nil' do
-      User.update_all :activation_code => 'foo-bar', :activated_at => nil
-      @user.reload.unsuspend!
-      @user.should be_pending
-    end
-  end
-
-protected
-  def create_user(options = {})
-    record = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire69', :password_confirmation => 'quire69' }.merge(options))
-    record.register! if record.valid?
-    record
-  end
-end
diff --git a/spec/rcov.opts b/spec/rcov.opts
deleted file mode 100644
index baf694c9..00000000
--- a/spec/rcov.opts
+++ /dev/null
@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*" 
---rails
\ No newline at end of file
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 391705bf..00000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index 3083b4a0..00000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- encoding : utf-8 -*-
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
-require 'spec/rails'
-
-# Restful_authentication
-#=======================
-include AuthenticatedTestHelper
-
-Spec::Runner.configure do |config|
-  # If you're not using ActiveRecord you should remove these
-  # lines, delete config/database.yml and disable :active_record
-  # in your config/boot.rb
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-
-  # == Fixtures
-  #
-  # You can declare fixtures for each example_group like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so right here. Just uncomment the next line and replace the fixture
-  # names with your fixtures.
-  #
-  # config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-  #
-  # You can also declare which fixtures to use (for example fixtures for test/fixtures):
-  #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-  #
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  #
-  # == Notes
-  # 
-  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
-end
diff --git a/test/fixtures/.gitignore b/test/fixtures/.gitignore
deleted file mode 100644
index 1dc89088..00000000
--- a/test/fixtures/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Legal reasons
-# =============
-# Have a look at doc/medindex_doc.sh
-medindex
diff --git a/test/fixtures/accounts.yml b/test/fixtures/accounts.yml
deleted file mode 100644
index 14e7703a..00000000
--- a/test/fixtures/accounts.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_account:
-  number: 777
-  bank_id: test_bank
-  holder: doctor_test (Doctor)
-  esr_id: 999999
-  pc_id: 01-01234-1
-  type: BankAccount
diff --git a/test/fixtures/addresses.yml b/test/fixtures/addresses.yml
deleted file mode 100644
index 343d99d2..00000000
--- a/test/fixtures/addresses.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-doctor_test_praxis:
-  region: ZH
-  vcard: doctor_test
-
-simple_address:
-  region: ZG
-  street_address: Chamerstr. 55b
-  postal_code: 6300
-  locality: Zug
-  vcard: simple_person
-
-de_address:
-  region: 
-  street_address: Münchnerstr. 66
-  postal_code: DE-55555
-  locality: Berlin
-  vcard: de_person
-
-us_address:
-  region: FL
-  street_address: Riverside
-  postal_code: 66666
-  locality: Florida
-  vcard: simple_person
-
-simple_address:
-  region: ZG
-  street_address: Chamerstr. 55b
-  postal_code: 6300
-  locality: Zug
-  vcard: simple_person
-
-simple_address:
-  region: ZG
-  street_address: Chamerstr. 55b
-  postal_code: 6300
-  locality: Zug
-  vcard: simple_person
-
diff --git a/test/fixtures/analyseliste/analyseliste.csv b/test/fixtures/analyseliste/analyseliste.csv
deleted file mode 100644
index d0918c6d..00000000
--- a/test/fixtures/analyseliste/analyseliste.csv
+++ /dev/null
@@ -1,95 +0,0 @@
-"Kapitel","Rev","Pos.-Nr.","Pos.-Nr. bisher","TP","Bezeichnung","Limitation","Fach-bereich",
-"1",,"1000.00","8188.11","85","1,25-Dihydroxycholecalciferol",,"C",
-"1",,"1001.00","8303.00","93","17-Hydroxycorticoide (17-OHCS)",,"C",
-"1",,"1002.00","8305.00","68","17-Hydroxyprogesteron",,"C",
-"1",,"1003.00","8354.00","155","17-Ketosteroide, fraktioniert",,"C",
-"1",,"1004.00","8355.00","42","17-Ketosteroide, gesamt",,"C",
-"1",,"1005.00","8189.00","93","2,3-Diphosphoglycerat (2,3-DPG), in Erythrozyten",,"C",
-"1",,"1006.00","8302.00","53","25-Hydroxycholecalciferol (Calcidiol)",,"C",
-"1",,"1007.00","8626.12","280","3-Methylcrotonyl-CoA-Carboxylase bei angeborenen Biotin-Stoffwechselkrankheiten mittels radioaktiv markiertem Substrat und einfacher Trennung von Substrat und Produkt","Limitation: in Stoffwechsellaboratorien der Universitätskliniken","C",
-"1",,"1008.00","8301.00","81","4-Hydroxy-3-Methoxymandelsäure",,"C",
-"1",,"1009.00","8442.00","15.900009765625","5' -Nukleotidase (NTP)",,"C",
-"1",,"1010.00","8626.09","320","5,10-Methylen-Tetrahydrofolat-Reduktase bei angeborenen Methionin-Stoffwechselkrankheiten mittels radioaktiv markiertem Substrat und einfacher Trennung von Substrat und Produkt","Limitation: in Stoffwechsellaboratorien der Universitätskliniken","C",
-"1","C 1.8.07","1022.00","8008.00","11.200009765625","Albumin, immunologisch, qn",,"CI",
-"1",,"1034.00","8017.00","19.300009765625","Alpha-1-Fetoprotein (AFP)",,"CI",
-"1",,"1099.00","8110.00-
-8111.01","36","Autoantikörper gegen Beta-2-Glykoprotein-I, IgA, ql",,"HI",
-"1",,"1100.00","8110.00-
-8111.01","36","Autoantikörper gegen Beta-2-Glykoprotein-I, IgA, qn",,"HI",
-"1",,"1192.00","8110.00","52","Autoantikörper seltene, ql, erste 2 Parameter, je","Limitation:

-Autoantikörper gegen 21-Hydroxylase

-Autoantikörper gegen 68 KD (hsp-70)

-Autoantikörper gegen Becherzellen

-Autoantikörper gegen BPI, IgA

-Autoantikörper gegen BPI, IgG

-Autoantikörper gegen Chondrozyten

-Autoantikörper gegen Chromatin

-Autoantikörper gegen Colon-Epithel

-Autoantikörper gegen Cytokeratin 8/18

-Autoantikörper gegen Desmoglein 1

-Autoantikörper gegen Desmoglein 3

-Autoantikörper gegen Elastase

-Autoantikörper gegen Filaggrin (Keratin)

-Autoantikörper gegen Fodrin

-Autoantikörper gegen Gangliosid GQ1B

-Autoantikörper gegen G-S-T

-Autoantikörper gegen Herzmuskel

-Autoantikörper gegen Hodengewebe

-Autoantikörper gegen Hu, Yo, Ri

-Autoantikörper gegen IA2

-Autoantikörper gegen Kathepsin

-Autoantikörper gegen Ku

-Autoantikörper gegen Laktoferrin

-Autoantikörper gegen MAG IgM

-Autoantikörper gegen Mi 2

-Autoantikörper gegen Myelin

-Autoantikörper gegen Nebennierengewebe

-Autoantikörper gegen Nukleosomen

-Autoantikörper gegen p53

-Autoantikörper gegen Parathyreoidea

-Autoantikörper gegen PM-Scl

-Autoantikörper gegen Recoverin

-Autoantikörper gegen Retikulin

-Autoantikörper gegen Retina

-Autoantikörper gegen ribosomale P-Proteine

-Autoantikörper gegen RNA

-Autoantikörper gegen Sulfatidil

-Autoantikörper gegen Titin

-Autoantikörper gegen Vestibularis

-Autoantikörper gegen VGCC","I",
-"1",,"1773.00","8638.01","44","Zytostatika der SL/ALT, immunologisch, inkl. Metaboliten, Blut",,"C",
-"2.2.1.1",,"2000.00","8800.01","305","Zell- oder Gewebekultur und Chromosomenpräparation, konstitutioneller Karyotyp",,"G",
-"2.2.1.1","N","2007.00",,"300","Zuschlag für labortechnischen und logistischen Mehraufwand bei zytogenetischen pränatalen Untersuchungen: manuelle Reinigung von Biopsiematerial, Kontaminationskontrolle mittels Mikrosatellitenanalyse, Doppel- oder Mehrfachanalysen. Die postnatale Nachkontrolle als Qualitätsmanagement ist bereits inbegriffen.","Limitation: Nur bei Chorionzotten; nur einmal pro Primärprobe; nicht kumulierbar mit Position 2900.00 Zuschlag für labortechnischen und logistischen Mehraufwand bei molekulargenetischen pränatalen Untersuchungen","G",
-"2.2.2",,"2320.00",,,"Mitochondriale Erkrankungen",,,
-"9115.02","610","HIV-Resistenz gegen antiretrovirale Substanzen: Testung inklusive Interpretationshilfe","Limitation: Indikation und Durchführung gemäss den ""2006 European HIV Drug Resistance Guidelines"" (http://www.rega.kuleuven.be/cev/index.php?id=26).
-In folgenden Laboratorien:
-1. Universität Basel, Institut für Medizinische Mikrobiologie
-2. HUG, Laboratoire Central de Virologie
-3. CHUV, Dép. de médecine de laboratoire, Service d’immunologie et d’allergie
-4. Universität Zürich, Nationales Zentrum für Retroviren","IM",
-"4.1",,"4700.00","9700.00","24","Auftragstaxe für Auftragnehmer von externen Aufträgen, pro Auftrag; nur anwendbar durch Laboratorien nach Artikel 54 Absatz 3 KVV
-
-Ein Auftrag entspricht einer Verordnung von Analysen durch einen Auftraggeber an ein Laboratorium, unabhängig von der Anzahl der Analysen, der Untersuchungsproben, der ausgefüllten Auftragsformulare und der betroffenen Laborfachbereiche (klin. Chemie, Hämatologie, klin. Immunologie, med. Genetik, med. Mikrobiologie). Die Arbeit eines Auftrags kann sich auf den ganzen Tag (z.B. Glukose-Tagesprofil) oder auf mehrere Tage (z.B. okkultes Blut in drei verschiedenen Stuhlproben) verteilen. Ein Auftrag kann sich auch auf mehrere Patienten bzw. Personen beziehen (z.B. Kopplungsuntersuchung in der Genetik).
-
-Bei Weiterleitung eines Teilauftrags unter Laboratorien kann nur das Erstlaboratorium, das den Auftrag erhalten hat, die Auftrags-Taxe verrechnen.",,,
-"4.1","N","4707.00",,"4","Präsenztaxe für das ärztliche Praxislaboratorium, pro Patient mit Konsultation inkl. Laboranalysen und pro Tag; nur anwendbar bei Durchführung der Laboruntersuchungen im eigenen Praxislaboratorium nach Artikel 54 Absatz 1 Buchstabe a Ziffer 3 KVV und in Form der Präsenzdiagnostik nach Artikel 54 Absatz 1 Buchstabe a Ziffer 2 KVV;
-
-pro Auftrag ebenfalls anwendbar bei Durchführung der Laboruntersuchungen für den Eigenbedarf sowie im Fremdauftrag durch Spitallaboratorien nach Artikel 54 Absatz 1 Buchstabe b und c sowie Absatz 2 KVV und von der Offizin eines Apothekers oder einer Apothekerin nach Artikel 54 Absatz 1 Buchstabe c KVV
-
-Definition des Auftrags siehe Position 4700.00","
-Limitation: kumulierbar mit den Positionen 4707.10 und 4707.20 Zuschläge für Analysen mit und ohne Suffix C, bis maximal 24 Taxpunkte",,
-"4.1","N","4707.10",,"2","Zuschlag für jede Analyse, die das Suffix C aufweist; nur anwendbar in Verbindung mit der Präsenztaxe nach 4707.00 bei Durchführung der Laboruntersuchungen im eigenen Praxislaboratorium nach Artikel 54 Absatz 1 Buchstabe a Ziffer 3 KVV und in Form der Präsenzdiagnostik nach Artikel 54 Absatz 1 Buchstabe a Ziffer 2 KVV;
-
-ebenfalls anwendbar in Verbindung mit der Präsenztaxe nach 4707.00 bei Durchführung der Laboruntersuchungen für den Eigenbedarf sowie im Fremdauftrag durch Spitallaboratorien nach Artikel 54 Absatz 1 Buchstabe b und c sowie Absatz 2 KVV und von der Offizin eines Apothekers oder einer Apothekerin nach Artikel 54 Absatz 1 Buchstabe c KVV","
-Limitation: kumulierbar mit den Positionen 4707.00 Präsenztaxe und 4707.20 Zuschlag für Analysen ohne Suffix C, bis maximal 24 Taxpunkte",,
-"4.1","N","4707.20",,"1","Zuschlag für jede Analyse, die kein Suffix C aufweist; nur anwendbar in Verbindung mit der Präsenztaxe nach 4707.00 bei Durchführung der Laboruntersuchungen im eigenen Praxislaboratorium nach Artikel 54 Absatz 1 Buchstabe a Ziffer 3 KVV und in Form der Präsenzdiagnostik nach Artikel 54 Absatz 1 Buchstabe a Ziffer 2 KVV;
-
-ebenfalls anwendbar in Verbindung mit der Präsenztaxe nach 4707.00 bei Durchführung der Laboruntersuchungen für den Eigenbedarf sowie im Fremdauftrag durch Spitallaboratorien nach Artikel 54 Absatz 1 Buchstabe b und c sowie Absatz 2 KVV und von der Offizin eines Apothekers oder einer Apothekerin nach Artikel 54 Absatz 1 Buchstabe c KVV","
-Limitation: kumulierbar mit den Positionen 4707.00 Präsenztaxe und 4707.10 Zuschlag für Analysen mit Suffix C, bis maximal 24 Taxpunkte",,
-"4.1","N","4708.00",,"1","Übergangszuschlag, pro Analyse","Limitation: Gültig ab 1.7.2009 bis 31.12.2011",,
-"5.4","S",,"9509.16","32","Chlamydia psittaci IgA, qn",,"M",
-"5.4","S",,"9509.21","24","Chlamydia Spezies IG oder IgG, ql",,"M",
-"5.4","S",,"9509.26","32","Chlamydia Spezies IgA, qn",,"M",
-,,,,,,,
-,,,,,,,
-
\ No newline at end of file
diff --git a/test/fixtures/analyseliste/analyseliste_old.csv b/test/fixtures/analyseliste/analyseliste_old.csv
deleted file mode 100644
index 4bc92925..00000000
--- a/test/fixtures/analyseliste/analyseliste_old.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-"Kapitel","Rev","Pos.-Nr.","Pos.-Nr. bisher","TP","Bezeichnung","Limitation","Fach-bereich"
-"5.1.3.2",,1020,8006,2.5,"Alanin-Aminotransferase (ALAT)",,"C"
-1,,1093,8058,2.5,"Aspartat-Aminotransferase (ASAT)",,"C"
-"5.1.3.2",,1245,8137,10,"C-reaktives Protein (CRP), qn",,"CHIM"
-"5.1.3.2",,1230,8158,2.5,"Cholesterin, total",,"C"
-"5.1.3.2",,1341,8249,2.5,"Gamma-Glutamyltranspeptidase (GGT)",,"C"
-"5.1.3.1",,1356,8259,2.5,"Glukose, Blut/Plasma/Serum",,"C"
-"5.1.3.2",,1372,8270,10,"Hämatogramm III mittels automatisierter Methode: Hämatogramm II, plus 3 Leukozyten-Subpopulationen","Limitation: nicht mit QBC-Methode","H"
-1,,1396,8275,8,"Hämoglobin mittels manueller Bestimmung, bei Kombination siehe Positionen 1299.00 bis 1305.00, 1377.000 bis 1391.00, 1399.00, 1400.00, 1403.00 und 1534.00","Limitation: nicht mit QBC-Methode","H"
-1,,1406,8284,2.5,"Harnstoff, Blut/Plasma/Serum",,"C"
-"5.1.3.2",,1410,8288,3.2,"HDL-Cholesterin, ohne separate Fällung",,"C"
-"5.1.3.2",,1479,8343,2.8,"Kalium, Blut/Plasma/Serum",,"C"
-5.2,,1249,8384,2.5,"Creatin-Kinase (CK), total","Limitation: nicht kumulierbar mit Position 1735.00 Troponin, T oder I, Schnelltest","C"
-1,,1509,8387,2.5,"Kreatinin, Blut/Plasma/Serum",,"C"
-1,,1532,8406,10,"Leukozyten-Zählung mittels manueller Bestimmung, bei Kombination siehe Positionen 1299.00 bis 1305.00, 1377.00 bis 1391.00, 1399.00, 1400.00, 1403.00 und 1534.00","Limitation: nicht mit QBC-Methode","H"
-1,,1666,8519,1,"Senkungsreaktion, exkl. Blutentnahme",,"CH"
-"5.1.3.2",,1731,8572,2.8,"Triglyceride",,"C"
-1,,1740,8580,1,"Urin-Teilstatus, 5-10 Parameter",,"C"
-5.3,,3330,9309,9.3,"Urin, Eintauch-Objektträger, negativ oder positiv","Limitation: nur bei der Schwangeren, nicht bei der Mutter oder beim Neugeborenen","M"
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
deleted file mode 100644
index a0dcbdbb..00000000
--- a/test/fixtures/attachments.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  title: MyString
-  file: MyString
-  object_id: 1
-  object_type: MyString
-  code: MyString
-
-two:
-  title: MyString
-  file: MyString
-  object_id: 1
-  object_type: MyString
-  code: MyString
diff --git a/test/fixtures/doctors.yml b/test/fixtures/doctors.yml
deleted file mode 100644
index b61b57ab..00000000
--- a/test/fixtures/doctors.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-test:
-  login:	test
-  code:		t1
-  zsr:		1234567
-  ean_party:	1122334455667
-  remarks:	Test Doctor
-
-single:
-  login:	$LABEL
-  code:		s1
-  zsr:		1234567
-  ean_party:	1122334455667
-  remarks:	Single doctor with no colleagues
-
-colleague_one:
-  login:	colleague
-  code:		c1
-  zsr:		7654321
-  ean_party:	9911223344556
-  remarks:	A doctor in a collective
diff --git a/test/fixtures/drug_articles.yml b/test/fixtures/drug_articles.yml
deleted file mode 100644
index b4aab211..00000000
--- a/test/fixtures/drug_articles.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  code: MyString
-  group_code: MyString
-  assort_key1: MyString
-  assort_key2: MyString
-  drug_product_id: 1
-  swissmedic_cat: MyString
-  swissmedic_no: MyString
-  hospital_only: false
-  clinical: false
-  article_type: MyString
-  vat_class_id: 1
-  active: false
-  insurance_limited: false
-  insurance_limitation_points: 
-  grand_frere: false
-  stock_fridge: false
-  stock_temperature: 
-  narcotic: false
-  under_bg: false
-  expires: 1
-  quantity: 
-  describtion: MyText
-  name: MyText
-  quantity_unit: MyString
-  package_type: MyString
-  multiply: MyString
-  alias: MyString
-  higher_co_payment: false
-  number_of_pieces: 1
-
-two:
-  code: MyString
-  group_code: MyString
-  assort_key1: MyString
-  assort_key2: MyString
-  drug_product_id: 1
-  swissmedic_cat: MyString
-  swissmedic_no: MyString
-  hospital_only: false
-  clinical: false
-  article_type: MyString
-  vat_class_id: 1
-  active: false
-  insurance_limited: false
-  insurance_limitation_points: 
-  grand_frere: false
-  stock_fridge: false
-  stock_temperature: 
-  narcotic: false
-  under_bg: false
-  expires: 1
-  quantity: 
-  describtion: MyText
-  name: MyText
-  quantity_unit: MyString
-  package_type: MyString
-  multiply: MyString
-  alias: MyString
-  higher_co_payment: false
-  number_of_pieces: 1
diff --git a/test/fixtures/drug_prices.yml b/test/fixtures/drug_prices.yml
deleted file mode 100644
index 5e164d64..00000000
--- a/test/fixtures/drug_prices.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  valid_from: 2009-04-13
-  price: 1.5
-  price_type: MyString
-  article_id: 1
-
-two:
-  valid_from: 2009-04-13
-  price: 1.5
-  price_type: MyString
-  article_id: 1
diff --git a/test/fixtures/drug_products.yml b/test/fixtures/drug_products.yml
deleted file mode 100644
index 17480c33..00000000
--- a/test/fixtures/drug_products.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  description: MyText
-  name: MyString
-  second_name: MyString
-  size: MyString
-  info: MyString
-  original: false
-  generic_group: MyString
-  drug_code1_id: 1
-  drug_code2_id: 1
-  therap_code1_id: 1
-  therap_code2_id: 1
-  application_code: MyString
-  dose_amount: 1.5
-  dose_units: MyString
-  dose_application: MyString
-  interaction_relevance: 1
-  active: false
-  partner_id: 1
-  drug_monograph_id: 1
-  galenic: MyString
-  concentration: 1.5
-  concentration_unit: MyString
-  special_drug_group_code: MyString
-  drug_for: MyString
-  probe_suited: false
-  life_span: 1.5
-  application_time: 1.5
-  excip_text: MyString
-  excip_quantity: MyString
-  excip_comment: MyString
-
-two:
-  description: MyText
-  name: MyString
-  second_name: MyString
-  size: MyString
-  info: MyString
-  original: false
-  generic_group: MyString
-  drug_code1_id: 1
-  drug_code2_id: 1
-  therap_code1_id: 1
-  therap_code2_id: 1
-  application_code: MyString
-  dose_amount: 1.5
-  dose_units: MyString
-  dose_application: MyString
-  interaction_relevance: 1
-  active: false
-  partner_id: 1
-  drug_monograph_id: 1
-  galenic: MyString
-  concentration: 1.5
-  concentration_unit: MyString
-  special_drug_group_code: MyString
-  drug_for: MyString
-  probe_suited: false
-  life_span: 1.5
-  application_time: 1.5
-  excip_text: MyString
-  excip_quantity: MyString
-  excip_comment: MyString
diff --git a/test/fixtures/drug_substances.yml b/test/fixtures/drug_substances.yml
deleted file mode 100644
index 948e9a3e..00000000
--- a/test/fixtures/drug_substances.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  name: MyString
-  description: MyString
-
-two:
-  name: MyString
-  description: MyString
diff --git a/test/fixtures/esr_files.yml b/test/fixtures/esr_files.yml
deleted file mode 100644
index 589c0c0c..00000000
--- a/test/fixtures/esr_files.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  size: 1
-  content_type: MyString
-  filename: MyString
-
-two:
-  size: 1
-  content_type: MyString
-  filename: MyString
diff --git a/test/fixtures/esr_records.yml b/test/fixtures/esr_records.yml
deleted file mode 100644
index 542d2e02..00000000
--- a/test/fixtures/esr_records.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  client_nr: MyString
-  reference: MyString
-  amount: 1.5
-  payment_reference: MyString
-  payment_date: 2009-08-20
-  transaction_date: 2009-08-20
-  value_date: 2009-08-20
-  rmicrofilm_nr: MyString
-  reject_code: MyString
-  reserved: MyString
-  payment_tax: MyString
-
-two:
-  client_nr: MyString
-  reference: MyString
-  amount: 1.5
-  payment_reference: MyString
-  payment_date: 2009-08-20
-  transaction_date: 2009-08-20
-  value_date: 2009-08-20
-  rmicrofilm_nr: MyString
-  reject_code: MyString
-  reserved: MyString
-  payment_tax: MyString
diff --git a/test/fixtures/imports.yml b/test/fixtures/imports.yml
deleted file mode 100644
index 5bf02933..00000000
--- a/test/fixtures/imports.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-#   column: value
-#
-# two:
-#   column: value
diff --git a/test/fixtures/insurance_policies.yml b/test/fixtures/insurance_policies.yml
deleted file mode 100644
index 8d80d3a7..00000000
--- a/test/fixtures/insurance_policies.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  insurance_id: 1
-  patient_id: 1
-  valid_from: 2009-08-12
-  valid_to: 2009-08-12
-  number: MyString
-  policy_type: MyString
-
-two:
-  insurance_id: 1
-  patient_id: 1
-  valid_from: 2009-08-12
-  valid_to: 2009-08-12
-  number: MyString
-  policy_type: MyString
diff --git a/test/fixtures/offices.yml b/test/fixtures/offices.yml
deleted file mode 100644
index 65aa592e..00000000
--- a/test/fixtures/offices.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-praxis_one:
-  name: Praxis Eins
-  doctors: test
-
-praxis_two:
-  name: Gemeinschafts Praxis
-  doctors: colleague_one
diff --git a/test/fixtures/patients.yml b/test/fixtures/patients.yml
deleted file mode 100644
index 5368e1d8..00000000
--- a/test/fixtures/patients.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-joe:
-  birth_date: 1990-02-03
-  doctor: test
-
-old_one:
-  birth_date: 1892-02-04
-  doctor: test
-
-old_two:
-  birth_date: 1901-02-04
-  doctor: test
-
-young_one:
-  birth_date: 2001-02-04
-  doctor: test
-
-twin_one:
-  birth_date: 1980-02-06
-  doctor: test
-
-twin_two:
-  birth_date: 1980-02-06
-  doctor: test
-
-simple_patient:
-  birth_date: 1979-02-02
-  doctor: test
-
-us_patient:
-  birth_date: 1979-02-03
-  doctor: test
diff --git a/test/fixtures/postal_codes.yml b/test/fixtures/postal_codes.yml
deleted file mode 100644
index 5bf02933..00000000
--- a/test/fixtures/postal_codes.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-#   column: value
-#
-# two:
-#   column: value
diff --git a/test/fixtures/recalls.yml b/test/fixtures/recalls.yml
deleted file mode 100644
index 480c80ef..00000000
--- a/test/fixtures/recalls.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  patient_id: 1
-  due_date: 2010-03-03
-  remarks: MyText
-
-two:
-  patient_id: 1
-  due_date: 2010-03-03
-  remarks: MyText
diff --git a/test/fixtures/service_records.yml b/test/fixtures/service_records.yml
deleted file mode 100644
index a949205e..00000000
--- a/test/fixtures/service_records.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-first_5min:
-  patient: old_one
-  provider: test
-  responsible: test
-  amount_tt: "8.19"
-  contract_number:
-  tariff_type: "001"
-  remark:
-  vat_rate: "0"
-  scale_factor_mt: "1"
-  quantity: "1"
-  session: "1"
-  code: "00.0010"
-  external_factor_mt: "1"
-  validate: "0"
-  scale_factor_tt: "1"
-  date: 2008-10-14 00:00:00
-  ref_code:
-  external_factor_tt: "1"
-  unit_factor_mt: "1"
-  medical_role: self_employed
-  treatment: ambulatory
-  amount_mt: "9.57"
-  location_id:
-  billing_role: both
-  section_code:
-  body_location: none
-  tariff_version:
-  obligation: "1"
-  splitting_factor: "1"
-  unit_factor_tt: "1"
diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml
deleted file mode 100644
index 5bf02933..00000000
--- a/test/fixtures/sessions.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-#   column: value
-#
-# two:
-#   column: value
diff --git a/test/fixtures/tarifcodes/tarifcodes.csv b/test/fixtures/tarifcodes/tarifcodes.csv
deleted file mode 100644
index 60275191..00000000
--- a/test/fixtures/tarifcodes/tarifcodes.csv
+++ /dev/null
@@ -1,241 +0,0 @@
-"Tarifcodes Forum Datenaustausch ",,,,,"20090402 / smf"
-"XML: tariff_code","XML:         recordtype           XML 4.0","XML: recordtype XML 5.0","TARIFE
-deutsch","TARIFS
-français","valid from","valid to","mutation"
-"001","record_tarmed","Tarmed","TARMED","TARMED","20020101","99991231","20060413"
-"002","record_uncalassified","Other","Tarmedpauschalen","Forfaits Tarmed","20080101","99991231","20071205"
-"272","record_cantonal","Other","Arzt-Tarif Liechtenstein","Tarif médical Liechtenstein","20020101","99991231","20061103"
-"302","record_cantonal","Other","Spitalleistungs-Katalog (SLK)","Catalogue des prestations hospitalières (CPH)","20020101","99991231","20060413"
-"311","record_physio","Paramed","Physiotherapie-Tarif (physioswiss)","Tarif suisse de physiothérapie (physioswiss)","20020101","99991231","20060413"
-"316","record_lab","Lab","Eidg. Analysenliste (EAL)","Liste fédérale des analyses (LA)","20020101","99991231","20090402"
-"317","record_lab","Lab","Eidg. Analysenliste (EAL) (Neu ab 1.7.2009)","Liste fédérale des analyses (LA) (Neu ab 1.7.2009)","20090701","99991231","20090402"
-"320","record_cantonal","Dental","Zahnarzt-Tarif PP (SSO)","Tarif dentaire suisse PP (SSO)","20020101","99991231","20060413"
-"321","record_cantonal","Dental","Tarif für zahntechnische Arbeiten PP (VZLS)","Tarif pour les travaux de technique dentaire PP (VZLS)","20020101","99991231","20060413"
-"322","record_cantonal","Dental","Zahnarzt-Tarif UV / MV / IV / KV (SSO)","Tarif dentaire suisse AA / AM / AI / Amal (SSO)","20020101","99991231","20060413"
-"323","record_cantonal","Dental","Tarif für zahntechnische Arbeiten UV / MV / IV / KV (VZLS)","Tarif pour les travaux de technique dentaire AA / AM / AI / Amal (VZLS)","20020101","99991231","20060413"
-"324","record_cantonal","Other","Chiropraktoren-Tarif (SCG)","Tarif des chiropraticiens (SCG)","20020101","99991231","20060413"
-"325","record_cantonal","Paramed","Ergotherapie-Tarif (EVS)","Tarif d'ergothérapie (ASE)","20020101","99991231","20060413"
-"326","record_cantonal","Other","Orthopädie-Schuhtechnische Arbeiten UV MV IV (SSOMV)","Travaux en technique Orthopédique de chaussures AA AM AI (ASMCBO)","20020101","99991231","20060413"
-"327","record_cantonal","Other","Orthopädietechnische Arbeiten Tarif UV MV IV (SVOT)","Travaux en orthopedie technique Tarif  AA AM AI (ASTO)","20020101","99991231","20060413"
-"328","record_cantonal","Paramed","Logopädietarif","Tarif de logopédie","20020101","99991231","20060413"
-"329","record_unclassified","Other","Tarif für Hörgeräte (HZV)","Tarif pour appareils acoustiques (HZV)","20020101","99991231","20060413"
-"330","record_unclassified","Paramed","Tarif für ambulante neuropsychologische Leistungen an versicherten Personen gemäss IVG, UVG und MVG in zugelassenen Institutionen (H+)","Tarif pour des prestations neuropsychologiques ambulatoires
-fournies aux assurés selon LAI,  LAA et LAM dans des institutions reconnues (H+)","20041001","99991231","20060413"
-"331","record_unclassified","Other","Tarif für Augenprothesen","Tarif de prothèse occulaire
-","20020101","99991231","20060413"
-"332","record_unclassified","Other","Evaluation der funktionellen Leistungsfähigkeit (EFL)","Evaluation de la capacité fonctionnelle (ECF)","20020101","99991231","20060413"
-"400","record_drug","Drug","Medikamenten-Katalog Pharmacode","Catalogue de médicaments code Pharma","20020101","99991231","20060413"
-"402","record_drug","Drug","Medikamenten-Katalog EAN","Catalogue de médicaments EAN","20040101","99991231","20060413"
-"403","record_drug","Drug","Medikamenten-Katalog swissmedic","Catalogue de médicaments swissmedic","20040101","99991231","20060413"
-"405","record_unclassified","Other","Ergänzungen zu den Medizinal-Tarifen","Adjonctions aux tarifs médicaux","20020101","99991231","20060413"
-"410","record_drug","Drug","Arzneimittelliste mit Tarif (ALT)","Liste des médicaments avec tarif (LMT)","20020101","99991231","20060413"
-"451","record_drug","Drug","Rayon-Codes","Codes rayon","20020101","99991231","20060413"
-"452","record_migel","Migel","MiGeL: Mittel und Gegenstände Liste","LiMA: liste des moyens et appareils","20010101","99991231","20061103"
-"500","record_unclassified","Other","SVK VBL-Tarif in CHF","SVK, tarif APS en CHF","20020101","99991231","20060413"
-"510","record_unclassified","Paramed","Tarif für Ernährungsberatung (SVDE)","Tarif de conseils nutritionnels (ASDD)","20020101","99991231","20060413"
-"511","record_unclassified","Paramed","Tarif für Diabetesberatung (SDG)","Tarif de conseils diabétiques (ASD)","20020101","99991231","20060413"
-"512","record_unclassified","Paramed","Tarif für nichtärztliche Beratungs- und Pflegeleistungen in Spitälern; ambulante onkologische Behandlung (H+)","Tarif pour des prestations non médicales de conseils et de soins en milieu hospitalier: traitement ambulatoire oncologique (H+)","20040101","20041231","20060413"
-"513","record_unclassified","Paramed","Tarif für nichtärztliche Beratungs- und Pflegeleistungen in Spitälern; ambulante Stomaberatung und -behandlung (H+)","Tarif pour des prestations non médicales de conseils et de soins en milieu hospitalier: conseil et traitement ambulatoires en matière de stomie (H+)","20040101","99991231","20060413"
-"514","record_unclassified","Paramed","Tarif für ambulante Leistungen der Ernährungsberatung in Spitälern (H+)","Tarif pour des prestations ambulatoires de conseils en nutrition fournies en établissements hospitaliers (H+)","20020101","99991231","20060413"
-"515","record_unclassified","Paramed","Tarif für ambulante Leistungen der Diabetesberatung in Spitälern (H+)","Tarif pour des prestations ambulatoires de conseils aux diabétiques fournies en établissements hospitaliers (H+)","20020101","99991231","20060413"
-"516","record_unclassified","Paramed","Tarif für Diabetesberatung (SBK)","Tarif pour les conseils diabétiques (ASI)","20041001","99991231","20060413"
-"530","record_unclassified","Other","Schweiz. Spitex-Rahmentarif","Tarife cadre suisse de Spitex","20020101","99991231","20060413"
-"540","record_unclassified","Other","Tarif für die Vermietung von Inhalations- und Atemtheraphiegeräte","Tarif de location d'appareils d'inhalation et de respiration","20020101","99991231","20060413"
-"550","record_unclassified","Other","Schweiz. Hebammentarif","Tarif suisse des sages-femmes","20020101","99991231","20060413"
-"551","record_unclassified","Paramed","Tarif für nichtärztliche Beratungs- und Pflegeleistungen in Spitälern; ambulante Behandlung im Zusammenhang mit Geburt, Geburtsvorbereitung und Wochenbett durch Hebammen, CHF (H+)","Tarif pour des prestations non médicales de conseils et de soins en milieu hospitalier: traitement ambulatoire lié à l’accouchement, à la préparation à l’accouchement et aux soins postnatals par des sages-femmes,  CHF (H+)","20040101","99991231","20060413"
-"552","record_unclassified","Paramed","Tarif für nichtärztliche Beratungs- und Pflegeleistungen in Spitälern; ambulante Behandlung im Zusammenhang mit Geburt, Geburtsvorbereitung und Wochenbett durch Hebammen, TP (H+)","Tarif pour des prestations non médicales de conseils et de soins en milieu hospitalier: traitement ambulatoire lié à l’accouchement, à la préparation à l’accouchement et aux soins postnatals par des sages-femmes,  PT (H+)","20040101","99991231","20060413"
-"553","record_physio","Paramed","Tarif für ambulante physiotherapeutische Leistungen in Spitälern (H+)","Tarif pour des prestations ambulatoires physiothérapeutiques fournies en établissements hospitaliers (H+)","20020101","99991231","200611103"
-"554","record_unclassified","Paramed","Tarif für ambulante ergotherapeutische Leistungen in Spitälern (H+)","Tarif pour des prestations ambulatoires ergothérapeutiques fournies en établissements hospitaliers (H+)","20020101","99991231","20060413"
-"555","record_unclassified","Paramed","Tarif für ambulante logopädische Leistungen in Spitälern (H+)","Tarif pour des prestations ambulatoires logopédiques fournies en établissements hospitaliers (H+)","20020101","99991231","20060413"
-"556","record_unclassified","Paramed","Tarif für ambulante muskuloskelettale Rehabilitation und Neurorehabilitation in Spitälern (H+)","Tarif de la réhabilitation musculoskelettal et neurologique ambulatoires en établissements hospitaliers (H+)","20070101","99991231","20060413"
-"570","record_druggist","Drug","Leistungsorientierte Abgeltung der Apothekerleistungen (LOA)","Rémunération basée sur les prestations (RBP)","20020101","99991231","20060413"
-"580","record_unclassified","Other","Schweiz. Rettungsflugwachttarif (REGA)","Tarif de la Garde Aérienne Suisse de Sauvetage (REGA)","20020101","99991231","20060413"
-"583","record_unclassified","Other","Transporte und Rettungen","Transports et sauvetages","20080401","99991231","20080305"
-"800","record_unclassified","Other","APDRG: cost-weight version 3.2","APDRG: cost-weight version 3.2","20020101","99991231","20060413"
-"804","record_unclassified","Other","APDRG: cost-weight version 4.1","APDRG: cost-weight version 4.1","20040101","99991231","20060413"
-"805","record_unclassified","Other","APDRG: cost-weight version 5.1","APDRG: cost-weight version 5.1","20050101","99991231","200611103"
-"806","record_unclassified","Other","APDRG: cost-weight version 6.0","APDRG: cost-weight version 6.0","20090101","99991231","20081027"
-"910","record_unclassified","Other","Spitaltarif für stationäre Leistungen nach UVG/IVG/MVG","Tarif hospitalier pour prestations stationnaires selon LAA/LAI/LAM","20020101","99991231","20060413"
-"920","record_unclassified","Other","Spitaltarif für stationäre Leistungen nach KVG","Tarif hospitalier pour prestations stationnaires selon LAMal","20020101","99991231","20060413"
-"930","record_unclassified","Other","Spitaltarif für stationäre Leistungen nach VVG","Tarif hospitalier pour prestations stationnaires selon LCA","20020101","99991231","20060413"
-"940","record_unclassified","Other","Spitaltarif für übrige Leistungen","Tarif hospitalier pour autres prestations","20020101","99991231","20060413"
-"951","record_unclassified","Other","Pflegeheim BESA 4","EMS BESA 4","20080101","99991231","20080305"
-"952","record_unclassified","Other","Pflegeheim BESA 12","EMS BESA 12","20080101","99991231","20080305"
-"953","record_unclassified","Other","Pflegeheim PLAISIR 8","EMS PLAISIR 8","20080101","99991231","20080305"
-"954","record_unclassified","Other","Pflegeheim RAI/RUG 12","EMS RAI/RUG 12","20080101","99991231","20080305"
-"955","record_unclassified","Other","Pflegeheim RAI/RUG 44 + 12","EMS RAI/RUG 44 + 12","20080101","99991231","20080305"
-"956","record_unclassified","Other","Pflegeheim ZSB 10","EMS ZSB 10","20080101","99991231","20080305"
-"957","record_unclassified","Other","Pflegeheim CH Index RAI/RUG 12","EMS CH Index RAI/RUG 12","20080101","99991231","20080305"
-"958","record_unclassified","Other","Pflegeheim Tessin 5","EMS Tessin 5","20080101","99991231","20080305"
-"959","record_unclassified","Other","Pflegeheim Fribourg 6","EMS Fribourg 6","20080101","99991231","20080305"
-"999","record_unclassified","Other","Leistungen, die in keinem der aufgeführten Tarife enthalten sind","Prestations ne figurant dans aucun des tarifs énumérés","20020101","99991231","20060413"
-,,,,,,
-,,,,,,
-"000-999",,,"Reserviert für Forum Datenaustausch ","Genehmigungskompetenz Forum Datenaustausch",,
-"AA1-ZZ9","record_unclassified","Other","Frei verfügbar für bilaterale Tarifvereinbarungen","Bewirtschaftung der Einträge durch das Fachorgan (ohne Gewähr)"
-"6xx,7xx,8xx",,,"Bestehende spezifische Tarife (Labor, Spital, etc.)","Bewirtschaftung der Einträge durch das Fachorgan (ohne Gewähr)"
-"000, 901 – 909, 860-879 und 998",,,"Reservierte Nummern durch Forum Datenaustausch ","Reservierte Nummern durch Forum Datenaustausch "
-"Tarifcodes Laborspezifische Tarife (ohne Gewähr)",,,,,"20080305 / smf"
-"XML: tariff_code","XML:         recordtype           XML 4.0","XML: recordtype XML 5.0","TARIFE
-deutsch","TARIFS
-français","valid from","valid to","mutation"
-"601","record_unclassified","other","Laborspezifische Analysen - Labor Dr. Güntert ","Analyses spécifiques de laboratoire - Labor Dr. Güntert ","20020101","99991231","20060413"
-"602","record_unclassified","other","Laborspezifische Analysen - IKMI ","Analyses spécifiques de laboratoire - IKMI ","20020101","20060831","20061103"
-"603","record_unclassified","other","Laborspezifische Analysen - Institut Dr. Risch","Analyses spécifiques de laboratoire - Institut Dr. Risch","20020101","99991231","20060413"
-"604","record_unclassified","other","Laborspezifische Analysen - Labor Bio-Analytica ","Analyses spécifiques de laboratoire - Labor Bio-Analytica ","20020101","99991231","20060413"
-"605","record_unclassified","other","Laborspezifische Analysen - Labor Ilamed AG ","Analyses spécifiques de laboratoire - Labor Ilamed AG ","20020101","99991231","20060413"
-"606","record_unclassified","other","Laborspezifische Analysen - Medics Labor AG ","Analyses spécifiques de laboratoire - Medics Labor AG ","20020101","99991231","20060413"
-"607","record_unclassified","other","Laborspezifische Analysen - Unilabs Mittelland ","Analyses spécifiques de laboratoire - Unilabs Mittelland ","20031101","99991231","20061103"
-"608","record_unclassified","other","Laborspezifische Analysen - LogoLab AG ","Analyses spécifiques de laboratoire - LogoLab AG ","20031101","99991231","20060413"
-"610","record_unclassified","other","Laborspezifische Analysen - Laborgemeinschaft 1 ","Analyses spécifiques de laboratoire - Laborgemeinschaft 1 ","20020101","99991231","20060413"
-"611","record_unclassified","other","Laborspezifische Analysen - Polytest Zug AG","Analyses spécifiques de laboratoire - Polytest Zug SA","20060101","99991231","20060413"
-"612","record_unclassified","other","Laborspezifische Analysen - Felix Platter Spital","Analyses spécifiques de laboratoire - Felix Platter Spital","20051101","99991231","20060413"
-"620","record_unclassified","other","Laborspezifische Analysen - Institut Dr. Viollier","Analyses spécifiques de laboratoire - Institut Dr. Viollier","20020101","99991231","20060413"
-"621","record_unclassified","other","Laborspezifische Analysen - Anamedica SA","Analyses spécifiques de laboratoire - Anamedica SA","20050401","99991231","20060413"
-"622","record_unclassified","other","Laborspezifische Analysen - Mealab AG Analyses","Analyses spécifiques de laboratoire - Mealab AG Analyses","20060101","99991231","20060413"
-"623","record_unclassified","other","Laborspezifische Analysen - Kantonsspital St. Gallen","Analyses spécifiques de laboratoire - Kantonsspital St. Gallen","20020101","99991231","20061103"
-"624","record_unclassified","other","Laborspezifische Analysen - Felix Platter Spital - TP","Analyses spécifiques de laboratoire -  Felix Platter Spital - TP","01-02-12","99991231","20080305"
-"699","record_unclassified","other","Labortarif für nicht speziell zugeteilte Laborsachen","Tarif de laboratoire divers","01-02-12","99991231","20080305"
-,,
-,,
-,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,
-,,,
-,,,
-"Tarifcodes Spitalspezifische Tarife (ohne Gewähr)",,,,,"20060413 / smf"
-"XML: tariff_code","XML:         recordtype           XML 4.0","XML: recordtype XML 5.0","TARIFE
-deutsch","TARIFS
-français","valid from","valid to","mutation"
-"701","record_unclassified","other","Fallpauschalen/Spitaltaxen Inselspital Bern","Forfaits par cas/taxes hospitalières Hôpital de l'Ile Berne","20020101","20091231","20060413"
-"702","record_unclassified","other","Fallpreispauschalen/Spitaltaxen Bürgerspital Solothurn","Forfaits par cas/taxes hospitalières Bürgerspital Solothurn","20020101","20091231","20060413"
-"703","record_unclassified","other","Ambulante Fallpauschalen UV/MV Inselspital Bern","Forfaits par cas en ambulatoire AA/AM Hôpital de l'Ile Berne","20020101","20091231","20060413"
-"710","record_unclassified","other","Cat. hosp. d'un jour vaudois pour maladie","Cat. hosp. d'un jour vaudois pour maladie","20020101","20081231","20060413"
-"711","record_unclassified","other","Cat. hosp. d'un jour vaudois pour accident","Cat. hosp. d'un jour vaudois pour accident","20020101","20081231","20060413"
-"712","record_unclassified","other","Cat. hosp. stationnaire vaudois pour maladie","Cat. hosp. stationnaire vaudois pour maladie","20020101","99991231","20060413"
-"713","record_unclassified","other","Cat. hosp. stationnaire vaudois pour accident","Cat. hosp. stationnaire vaudois pour accident","20020101","99991231","20060413"
-"714","record_unclassified","other","Cat. ambulatoire vaudois pour maladie","Cat. ambulatoire vaudois pour maladie","20020101","20081231","20060413"
-"715","record_unclassified","other","Cat. ambulatoire vaudois pour accident","Cat. ambulatoire vaudois pour accident","20020101","20081231","20060413"
-"716","record_unclassified","other","Cat. hebergement vaudois","Cat. hébergement vaudois","20020101","99991231","20060413"
-"730","record_unclassified","other","Forfaits et taxes de jour HCF","Forfaits et taxes de jour HCF","20020101","20091231","20060413"
-"780","record_unclassified","other","Kantonsspital NW, Allgemein und Halbprivat","Kantonsspital NW, Allgemein und Halbprivat","20020101","99991231","20060413"
-"810","record_unclassified","other","Offizieller Berner OKP-Tarif","Offizieller Berner OKP-Tarif","20040401","99991231","20060413"
-"850","record_unclassified","other","RKB Pauschalen","Forfait RKB","20050401","99991231","20060413"
-"851","record_unclassified","other","Spitaltarif Psychiatrische Dienste des Kantons St. Gallen","Tarif hospitalier - Centres psychiatriques du canton de Saint-Gall","20050701","99991231","20060413"
-,,
-"Tarifcodes Arzt kantonal & spezifische Tarife (ohne Gewähr)",,,,,"20061103 / smf"
-"XML: tariff_code","XML:         recordtype           XML 4.0","XML: recordtype XML 5.0","TARIFE
-deutsch","TARIFS
-français","valid from","valid to","mutation"
-"010","record_cantonal","Other","Kant. Arzt-Tarif Zürich","Tarif médical cantonal Zurich","20020101","20081231","20060413"
-"011","record_cantonal","Other","Kant. Privat-Tarif Zürich","Tarif privé cantonal Zurich","20020101","20041231","20060413"
-"021","record_cantonal","Other","Kant. Arzt-Tarif Bern","Tarif médical cantonal Berne","20020101","20081231","20060413"
-"022","record_unclassified","Other","Ambulante Untersuchungen u. Behandlungen KVBK Inselspital Bern","Examens et traitements ambulatoires FBAM / Hôpital de l'Ile Berne","20020101","20041231","20060413"
-"026","record_unclassified","Other","Spez.stationäre Tarifpositionen Inselspital Bern","Positions tarifaires hospitalières spéciales Hôpital de l'Ile Berne","20020101","20041231","20060413"
-"027","record_unclassified","Other","Spez. stationäre Tarifpositionen Frauenklinik Bern","Positions tarifaires hospitalières spéciales Frauenklinik Berne","20020101","20041231","20060413"
-"030","record_cantonal","Other","Kant. Arzt-Tarif Luzern","Tarif médical cantonal Lucerne","20020101","20081231","20060413"
-"043","record_cantonal","Other","Kant. Arzt-Tarif Uri","Tarif médical cantonal Uri","20020101","20081231","20060413"
-"052","record_cantonal","Other","Kant. Arzt-Tarif Schwyz","Tarif médical cantonal Schwyz","20020101","20081231","20060413"
-"062","record_cantonal","Other","Kant. Arzt-Tarif Nid-/Obwalden","Tarif médical cantonal Nidwald/Obwald","20020101","20081231","20060413"
-"080","record_cantonal","Other","Kant. Arzt-Tarif Glarus","Tarif médical cantonal Glaris","20020101","20081231","20060413"
-"091","record_cantonal","Other","Kant. Arzt-Tarif Zug","Tarif médical cantonal Zoug","20020101","20081231","20060413"
-"101","record_cantonal","Other","Tarif médical cantonal Fribourg","Tarif médical cantonal Fribourg","20020101","20081231","20060413"
-"110","record_cantonal","Other","Kant. Arzt-Tarif Solothurn","Tarif médical cantonal Soleure","20020101","20081231","20060413"
-"121","record_cantonal","Other","Kant. Arzt-Tarif Basel-Stadt","Tarif médical cantonal Bâle-Ville","20020101","20081231","20060413"
-"133","record_cantonal","Other","Kant. Arzt-Tarif Basel-Land","Tarif médical cantonal Bâle-Campagne","20020101","20081231","20060413"
-"134","record_cantonal","Other","Zusatzvereinbarung Kapitel Radioonkologie zum Arzttarif BL, Dr. Beat Amsler, Allschwil","Convention complémentaire chapitre radiooncologie au tarif médical BL, Dr. Beat Amsler, Allschwil","20020101","99991231","20060413"
-"142","record_cantonal","Other","Kant. Arzt-Tarif Schaffhausen","Tarif médical cantonal Schaffhouse","20020101","20081231","20060413"
-"150","record_cantonal","Other","Kant. Arzt-Tarif Appenzell","Tarif médical cantonal Appenzell","20020101","20081231","20060413"
-"174","record_cantonal","Other","Kant. Arzt-Tarif St.Gallen","Tarif médical cantonal St-Gall","20020101","20081231","20060413"
-"185","record_cantonal","Other","Kant. Arzt-Tarif Graubünden","Tarif médical cantonal Grisons","20020101","20081231","20060413"
-"193","record_cantonal","Other","Kant. Arzt-Tarif Aargau","Tarif médical cantonal Argovie","20020101","20081231","20060413"
-"204","record_cantonal","Other","Kant. Arzt-Tarif Thurgau","Tarif médical cantonal Thurgovie","20020101","20081231","20060413"
-"213","record_cantonal","Other","Tariffa medica cantonale Ticino","Tariffa medica cantonale Ticino","20020101","20081231","20060413"
-"220","record_cantonal","Other","Tarif médical cantonal Vaud","Tarif médical cantonal Vaud","20020101","20081231","20060413"
-"230","record_cantonal","Other","Kant. Arzt-Tarif Wallis","Tarif médical cantonal Valais","20020101","20081231","20060413"
-"242","record_cantonal","Other","Tarif médical cantonal Neuchâtel","Tarif médical cantonal Neuchâtel","20020101","20081231","20060413"
-"251","record_cantonal","Other","Tarif médical cantonal Genève","Tarif médical cantonal Genève","20020101","20081231","20060413"
-"263","record_cantonal","Other","Tarif médical cantonal Jura","Tarif médical cantonal Jura","20020101","20081231","20060413"
-"581","record_unclassified","Other","Tarif für Schweizer Krankenwagen","Tarif pour ambulances suisses","20020101","99991231","20060413"
-"582","record_unclassified","Paramed","Tarif für Schweizer Psychologen","Tarif pour psychologues suisses","20020101","99991231","20060413"
-"Tarifcodes für bilaterale Tarife (ohne Gewähr)",,,,"20090402 / smf"
-"XML: tariff_code","Reserviert für:","TARIFE
-deutsch","TARIFS
-français","valid from","valid to","mutation"
-"H40","Helsana","Helsana-Tarif Spital VVG","Helsana-Tarif Spital VVG","20080101","99991231","20080305"
-"H41","Helsana","Helsana-Tarif Pflegheime","Helsana-Tarif Pflegheime","20080101","99991231","20080305"
-"H00-H99","Helsana","prov. Reservierung Helsana","prov. Reservierung Helsana","20080101","99991231","20080305"
-"H0H-H9H","Helsana","prov. Reservierung Helsana","prov. Reservierung Helsana","20080101","99991231","20080305"
-"S00 ","Suva","ParaSuva","ParaSuva","20090101","99991231","20090402"
-"S01","Suva","KIMSA-Tarif","KIMSA-Tarif","20090101","99991231","20081027"
-"S00-S99","Suva","prov. Reservierung Suva","prov. Reservierung Suva","20090101","99991231","20081027"
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,,,,
-,,
-,,
-,,
-
\ No newline at end of file
diff --git a/test/fixtures/tariff_codes.yml b/test/fixtures/tariff_codes.yml
deleted file mode 100644
index d4d1d6dd..00000000
--- a/test/fixtures/tariff_codes.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  tariff_code: MyString
-  record_type_v4: MyString
-  record_type_v5: MyString
-  description: MyString
-  valid_from: 2009-04-14
-  valid_to: 2009-04-14
-
-two:
-  tariff_code: MyString
-  record_type_v4: MyString
-  record_type_v5: MyString
-  description: MyString
-  valid_from: 2009-04-14
-  valid_to: 2009-04-14
diff --git a/test/fixtures/tariff_items_tariff_items.yml b/test/fixtures/tariff_items_tariff_items.yml
deleted file mode 100644
index 5bf02933..00000000
--- a/test/fixtures/tariff_items_tariff_items.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-#   column: value
-#
-# two:
-#   column: value
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
deleted file mode 100644
index f3ca14b9..00000000
--- a/test/fixtures/users.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_user:
-  login: "test"
-  name: "Test User"
-  state: "active"
-  email: "test@example.com"
-  crypted_password: "bec2d1bd3a0b0f83a81fe847f718606a20388087"
-  salt: "1e475e590ab144107f44977488183210e386b936"
diff --git a/test/fixtures/vat_classes.yml b/test/fixtures/vat_classes.yml
deleted file mode 100644
index 3223104e..00000000
--- a/test/fixtures/vat_classes.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-full:
-  valid_from: 2001-01-01
-  rate: 7.6
-  code: full
-
-reduced:
-  valid_from: 2001-01-01
-  rate: 2.4
-  code: reduced
-
-excluded:
-  valid_from: 2001-01-01
-  rate: 0.0
-  code: excluded
-
diff --git a/test/fixtures/vcards.yml b/test/fixtures/vcards.yml
deleted file mode 100644
index 499e8401..00000000
--- a/test/fixtures/vcards.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-# Vcards
-# ======
-full_name:
-  full_name: Full Name
-
-simple_person:
-  given_name: John
-  family_name: Doe
-  object: simple_patient (Patient)
-
-us_person:
-  given_name: John W.
-  family_name: Doe
-  nickname: Joe
-  honorific_prefix: Mr.
-  honorific_suffix: Jr.
-  object: us_patient (Patient)
-
-de_person:
-  given_name: Céline
-  family_name: Müller
-  nickname: Ändi
-  object: old_one (Patient)
-
-inactive:
-  full_name: Inactive
-  active: false
-
-
-# Doctors
-# =======
-doctor_test:
-  full_name: Test Doktor
-  object: test (Doctor)
-
-doctor_single:
-  full_name: Single Doktor
-  object: single (Doctor)
-
-doctor_colleague_one:
-  full_name: Colleague One Doktor
-  object: colleague_one (Doctor)
-
-
-# Patients
-# ========
-patient:
-  given_name: Joe
-  family_name: Smith
-  full_name: Patient
-  object: joe (Patient)
-
-old_two:
-  object: old_two (Patient)
-  given_name: $LABEL
-  family_name: $LABEL
-
-young_one:
-  object: young_one (Patient)
-  given_name: $LABEL
-  family_name: $LABEL
-
-twin_one:
-  object: twin_one (Patient)
-  given_name: $LABEL
-  family_name: $LABEL
-
-twin_two:
-  object: twin_two (Patient)
-  given_name: $LABEL
-  family_name: $LABEL
-
-us_patient:
-  object: us_patient (Patient)
-  given_name: $LABEL
-  family_name: $LABEL
-
-# Banks
-# =====
-bank:
-  full_name: Rich Corp.
diff --git a/test/functional/accounts_controller_test.rb b/test/functional/accounts_controller_test.rb
deleted file mode 100644
index d08839c4..00000000
--- a/test/functional/accounts_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class AccountsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/bookings_controller_test.rb b/test/functional/bookings_controller_test.rb
deleted file mode 100644
index c0d59603..00000000
--- a/test/functional/bookings_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class BookingsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/bookkeeping_controller_test.rb b/test/functional/bookkeeping_controller_test.rb
deleted file mode 100644
index f0134b62..00000000
--- a/test/functional/bookkeeping_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class BookkeepingControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/functional/contact_controller_test.rb b/test/functional/contact_controller_test.rb
deleted file mode 100644
index 3a4297f3..00000000
--- a/test/functional/contact_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class ContactControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/diagnoses_controller_test.rb b/test/functional/diagnoses_controller_test.rb
deleted file mode 100644
index bf3ef22b..00000000
--- a/test/functional/diagnoses_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DiagnosesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/doctors_controller_test.rb b/test/functional/doctors_controller_test.rb
deleted file mode 100644
index a0402ae3..00000000
--- a/test/functional/doctors_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DoctorsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/drug_articles_controller_test.rb b/test/functional/drug_articles_controller_test.rb
deleted file mode 100644
index a77f6887..00000000
--- a/test/functional/drug_articles_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugArticlesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/functional/drugs_controller_test.rb b/test/functional/drugs_controller_test.rb
deleted file mode 100644
index 45addf5f..00000000
--- a/test/functional/drugs_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/esr_bookings_controller_test.rb b/test/functional/esr_bookings_controller_test.rb
deleted file mode 100644
index 8fe0e47f..00000000
--- a/test/functional/esr_bookings_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class EsrBookingsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/insurance_policies_controller_test.rb b/test/functional/insurance_policies_controller_test.rb
deleted file mode 100644
index 2c773a0a..00000000
--- a/test/functional/insurance_policies_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class InsurancePoliciesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/insurances_controller_test.rb b/test/functional/insurances_controller_test.rb
deleted file mode 100644
index f70350ad..00000000
--- a/test/functional/insurances_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class InsurancesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/invoices_controller_test.rb b/test/functional/invoices_controller_test.rb
deleted file mode 100644
index 211ceb2a..00000000
--- a/test/functional/invoices_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class InvoicesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/mailings_controller_test.rb b/test/functional/mailings_controller_test.rb
deleted file mode 100644
index 2548cb0e..00000000
--- a/test/functional/mailings_controller_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class MailingsControllerTest < ActionController::TestCase
-  def test_index
-    get :index
-    assert_response :redirect
-  end
-
-  def test_latest_overview
-    get :latest_overview
-    assert_response :success
-  end
-
-  def test_list
-    get :list
-    assert_response :success
-  end
-end
diff --git a/test/functional/medical_cases_controller_test.rb b/test/functional/medical_cases_controller_test.rb
deleted file mode 100644
index da69673f..00000000
--- a/test/functional/medical_cases_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class MedicalCasesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/patients_controller_test.rb b/test/functional/patients_controller_test.rb
deleted file mode 100644
index b62da71e..00000000
--- a/test/functional/patients_controller_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class PatientsControllerTest < ActionController::TestCase
-  def test_list
-    get :list
-    assert_response :success
-  end
-  
-  def test_index
-    get :index
-    assert_response :redirect
-  end
-
-  def test_new
-    get :new
-    assert_response :success
-  end
-
-  def test_search
-    # No match
-    xml_http_request :post, :search, {:patient => {:birth_date => '1.1.2000'}}
-    assert_response :success
-    assert_select ".search_result", false
-  end
-
-  def test_search_date
-    xml_http_request :post, :search, {:patient => {:birth_date => '3.2.1990'}}
-    assert_response :success
-    assert_select ".search_result", 1
-    assert_select "#search_result_patient_#{patients(:joe).id}", 1
-
-    xml_http_request :post, :search, {:patient => {:birth_date => '3.2.90'}}
-    assert_response :success
-    assert_select ".search_result", 1
-    assert_select "#search_result_patient_#{patients(:joe).id}", 1
-
-    xml_http_request :post, :search, {:patient => {:birth_date => '4.2.01'}}
-    assert_response :success
-    assert_select ".search_result", 2
-    assert_select "#search_result_patient_#{patients(:young_one).id}", 1
-    assert_select "#search_result_patient_#{patients(:old_two).id}", 1
-
-    xml_http_request :post, :search, {:patient => {:name => '', :birth_date => '6.2.80'}}
-    assert_response :success
-    assert_select ".search_result", 2
-    assert_select "#search_result_patient_#{patients(:twin_one).id}", 1
-    assert_select "#search_result_patient_#{patients(:twin_two).id}", 1
-  end
-
-  def test_search_by_name
-    xml_http_request :post, :search, {:patient => {:name => 'Doe', :birth_date => ''}}
-    assert_response :success
-    assert_select ".search_result", 2
-    assert_select "#search_result_patient_#{patients(:us_patient).id}", 1
-    assert_select "#search_result_patient_#{patients(:simple_patient).id}", 1
-    assert_select "#search_result_patient_#{patients(:joe).id}", 0
-  end
-
-  def test_show
-    get :show, :id => patients(:simple_patient).id
-    assert_response :success
-
-    # Return 404, but nice error if not found
-    get :show, :id => 777
-    assert_response :missing
-
-    get :show, :id => patients(:joe).id
-    assert_response :success
-
-#    get :show, :id => patients(:no_vcard).id
-#    assert_response :success
-  end
-end
diff --git a/test/functional/phone_numbers_controller_test.rb b/test/functional/phone_numbers_controller_test.rb
deleted file mode 100644
index 7ce586cd..00000000
--- a/test/functional/phone_numbers_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class PhoneNumbersControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/recalls_controller_test.rb b/test/functional/recalls_controller_test.rb
deleted file mode 100644
index bf51b0e3..00000000
--- a/test/functional/recalls_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class RecallsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
deleted file mode 100644
index f759fac8..00000000
--- a/test/functional/search_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class SearchControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/service_items_controller_test.rb b/test/functional/service_items_controller_test.rb
deleted file mode 100644
index c916065a..00000000
--- a/test/functional/service_items_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class ServiceItemsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/service_records_controller_test.rb b/test/functional/service_records_controller_test.rb
deleted file mode 100644
index 70a951ec..00000000
--- a/test/functional/service_records_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class ServiceRecordsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
deleted file mode 100644
index 8e542ea1..00000000
--- a/test/functional/sessions_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class SessionsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/tariff_items_controller_test.rb b/test/functional/tariff_items_controller_test.rb
deleted file mode 100644
index 7cc462ea..00000000
--- a/test/functional/tariff_items_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TariffItemsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/treatments_controller_test.rb b/test/functional/treatments_controller_test.rb
deleted file mode 100644
index f50447e3..00000000
--- a/test/functional/treatments_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class TreatmentsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
deleted file mode 100644
index 8c7b48aa..00000000
--- a/test/functional/welcome_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class WelcomeControllerTest < ActionController::TestCase
-  def test_index
-    get :index
-    assert_response :success
-  end
-end
diff --git a/test/mocks/test/application_controller_mock.rb b/test/mocks/test/application_controller_mock.rb
deleted file mode 100644
index de7bd9ca..00000000
--- a/test/mocks/test/application_controller_mock.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- encoding : utf-8 -*-
-class ApplicationController
-  private
-  def authenticate
-    @current_doctor = Doctor.find_by_login('test')
-    true
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index 63acdb5d..00000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- encoding : utf-8 -*-
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test//test_help'
-
-require 'application_controller_mock'
-
-class Test::Unit::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
-
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  set_fixture_class :vcards => Vcards::Vcard
-  set_fixture_class :addresses => Vcards::Address
-  set_fixture_class :accounts => Accounting::Account
-  set_fixture_class :banks => Accounting::Bank
-
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :vcards, :doctors, :offices, :addresses, :banks, :accounts
-  fixtures :patients
-
-  # Add more helper methods to be used by all tests here...
-end
diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
deleted file mode 100644
index ef6d328c..00000000
--- a/test/unit/attachment_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class AttachmentTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/unit/consultation_test.rb b/test/unit/consultation_test.rb
deleted file mode 100644
index f21981d3..00000000
--- a/test/unit/consultation_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class ConsultationTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/diagnose_test.rb b/test/unit/diagnose_test.rb
deleted file mode 100644
index 0725d53d..00000000
--- a/test/unit/diagnose_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class DiagnoseTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/doctor_test.rb b/test/unit/doctor_test.rb
deleted file mode 100644
index 044c93d2..00000000
--- a/test/unit/doctor_test.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class DoctorTest < ActiveSupport::TestCase
-  def test_offices
-    doctor = doctors(:single)
-    assert_kind_of(Doctor, doctor)
-    
-    assert_equal [], doctor.offices
-
-    office = Office.new
-    office.save
-    
-    doctor.offices << office
-    assert_equal [office], doctor.offices
-
-    # Test office two from fixture
-    assert_equal [offices(:praxis_two)], doctors(:colleague_one).offices
-    assert_equal offices(:praxis_two), doctors(:colleague_one).office
-  end
-
-  def test_colleagues
-    # :test is not part of any office
-    assert_equal [doctors(:test)], doctors(:test).colleagues
-    
-    # :colleague_one's only colleague of himself
-    assert_equal [doctors(:colleague_one)], doctors(:colleague_one).colleagues
-    
-    assert_equal 1, offices(:praxis_two).doctors.count
-
-    # add :test to :praxis_two...
-    doc1 = doctors(:test)
-    off2 = offices(:praxis_two)
-    off2.doctors << doc1
-    # ...now there's an office of two
-    assert_equal 2, off2.doctors.count
-
-    doc1.reload
-    assert_equal [doctors(:colleague_one), doc1].sort{|x, y| y.id <=> x.id}, doc1.colleagues.sort{|x, y| y.id <=> x.id}
-    assert_equal [doctors(:colleague_one), doctors(:test)].sort{|x, y| y.id <=> x.id}, doctors(:test).colleagues.sort{|x, y| y.id <=> x.id}
-  end
-
-  def test_account
-    assert_kind_of(Accounting::Account, doctors(:test).account)
-  end
-end
diff --git a/test/unit/drug_article_test.rb b/test/unit/drug_article_test.rb
deleted file mode 100644
index 150bf423..00000000
--- a/test/unit/drug_article_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugArticleTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/drug_price_test.rb b/test/unit/drug_price_test.rb
deleted file mode 100644
index 70423a55..00000000
--- a/test/unit/drug_price_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugPriceTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/drug_product_test.rb b/test/unit/drug_product_test.rb
deleted file mode 100644
index 360a9e5f..00000000
--- a/test/unit/drug_product_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugProductTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/drug_substance_test.rb b/test/unit/drug_substance_test.rb
deleted file mode 100644
index 9e659813..00000000
--- a/test/unit/drug_substance_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugSubstanceTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/employee_test.rb b/test/unit/employee_test.rb
deleted file mode 100644
index 182c2034..00000000
--- a/test/unit/employee_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class EmployeeTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/esr_file_test.rb b/test/unit/esr_file_test.rb
deleted file mode 100644
index ba8eebe6..00000000
--- a/test/unit/esr_file_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class EsrFileTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/esr_record_test.rb b/test/unit/esr_record_test.rb
deleted file mode 100644
index 5fb5f511..00000000
--- a/test/unit/esr_record_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class EsrRecordTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/helpers/bookkeeping_helper_test.rb b/test/unit/helpers/bookkeeping_helper_test.rb
deleted file mode 100644
index 8c6f35d1..00000000
--- a/test/unit/helpers/bookkeeping_helper_test.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class BookkeepingHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/drug_articles_helper_test.rb b/test/unit/helpers/drug_articles_helper_test.rb
deleted file mode 100644
index 637bd136..00000000
--- a/test/unit/helpers/drug_articles_helper_test.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class DrugArticlesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/recalls_helper_test.rb b/test/unit/helpers/recalls_helper_test.rb
deleted file mode 100644
index b09bf47b..00000000
--- a/test/unit/helpers/recalls_helper_test.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class RecallsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/import_test.rb b/test/unit/import_test.rb
deleted file mode 100644
index acc43c53..00000000
--- a/test/unit/import_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class ImportTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/unit/insurance_policy_test.rb b/test/unit/insurance_policy_test.rb
deleted file mode 100644
index 8a060ec0..00000000
--- a/test/unit/insurance_policy_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class InsurancePolicyTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/insurance_test.rb b/test/unit/insurance_test.rb
deleted file mode 100644
index 50cbac7b..00000000
--- a/test/unit/insurance_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class InsuranceTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/invoice_test.rb b/test/unit/invoice_test.rb
deleted file mode 100644
index e3ce377c..00000000
--- a/test/unit/invoice_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class InvoiceTest < ActiveSupport::TestCase
-  def test_one_position
-    patient = patients(:old_one)
-  end
-end
diff --git a/test/unit/law_test.rb b/test/unit/law_test.rb
deleted file mode 100644
index 4da19e2f..00000000
--- a/test/unit/law_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class LawTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/mail_test.rb b/test/unit/mail_test.rb
deleted file mode 100644
index 8ac5854c..00000000
--- a/test/unit/mail_test.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class MailTest < ActionMailer::TestCase
-  tests Mail
-  def test_message_to_zytolabor
-    assert true
-  end
-
-end
diff --git a/test/unit/medical_case_test.rb b/test/unit/medical_case_test.rb
deleted file mode 100644
index 7dd73816..00000000
--- a/test/unit/medical_case_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class MedicalCaseTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/office_test.rb b/test/unit/office_test.rb
deleted file mode 100644
index c2090e71..00000000
--- a/test/unit/office_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class OfficeTest < ActiveSupport::TestCase
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/patient_test.rb b/test/unit/patient_test.rb
deleted file mode 100644
index 74d10b33..00000000
--- a/test/unit/patient_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class PatientTest < ActiveSupport::TestCase
-  def test_vcards
-    # Find nobody; return nil
-    assert_nil Vcards::Vcard.find_by_name('XXXX')
-
-    assert_equal patients(:joe), Vcards::Vcard.find_by_name('Patient').object
-    
-    patient = Patient.new
-    patient.save
-    vcard = Vcards::Vcard.new(:full_name => 'vcard patient')
-    vcard.object = patient
-    vcard.save
-    assert_equal patient, Vcards::Vcard.find_by_name('vcard patient').object
-
-    patient = Patient.new
-    patient.save
-    vcard = Vcards::Vcard.new(:full_name => 'patient vcards')
-    vcard.save
-    patient.vcard = vcard
-    patient.save
-    assert_equal patient, Vcards::Vcard.find_by_name('patient vcards').object
-  end
-
-  def test_new_with_vcard_attributes
-#    patient = Patient.new(:full_name => 'address patient')
-#    patient.save
-    
-#    found_patient = Patient.by_name('address patient')
-#    assert_equal patient, found_patient
-#    assert_equal 'address patient', patient.name
-  end
-
-  def test_vcard_delegation
-#    patient = Patient.new(:full_name => 'address patient')
-#    assert_equal 'address patient', patient.vcard.full_name
-#    assert_equal 'address patient', patient.full_name
-  end
-
-  def test_vcard_address
-#    patient = Patient.new(:full_name => 'address patient', :street_address => 'Street 1')
-#    assert_equal 'Street 1', patient.vcard.street_address
-#    patient.save
-    
-#    found_patient = Patient.by_name('address patient')
-#    assert_equal patient, found_patient
-#    assert_equal 'address patient', patient.name
-#    assert_equal 'Street 1', patient.vcard.street_address
-  end
-
-  def test_by_name
-    assert_equal [patients(:joe)], Patient.by_name('Patient')
-    assert_equal 1, Patient.by_name('Patient').count
-
-    assert_equal [patients(:us_patient), patients(:simple_patient)], Patient.by_name('Doe')
-    assert_equal 2, Patient.by_name('Doe').count
-  end
-
-  def test_by_date
-    assert_equal [], Patient.by_date('1.1.2000')
-    assert_equal 0, Patient.by_date('1.1.200').count
-
-    assert_equal [patients(:joe)], Patient.by_date('3.2.1990')
-    assert_equal 1, Patient.by_date('3.2.1990').count
-
-    assert_equal [patients(:joe)], Patient.by_date('3.2.90')
-    assert_equal 1, Patient.by_date('3.2.90').count
-
-    assert_equal [patients(:young_one), patients(:old_two)], Patient.by_date('4.2.01')
-    assert_equal 2, Patient.by_date('4.2.01').count
-  end
-end
diff --git a/test/unit/patient_vcard_test.rb b/test/unit/patient_vcard_test.rb
deleted file mode 100644
index af1b1dd4..00000000
--- a/test/unit/patient_vcard_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class PatientVcardTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/postal_code_test.rb b/test/unit/postal_code_test.rb
deleted file mode 100644
index 68c4c868..00000000
--- a/test/unit/postal_code_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class PostalCodeTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/recall_test.rb b/test/unit/recall_test.rb
deleted file mode 100644
index 5f3be59c..00000000
--- a/test/unit/recall_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class RecallTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/unit/service_record_test.rb b/test/unit/service_record_test.rb
deleted file mode 100644
index 5ca5dc65..00000000
--- a/test/unit/service_record_test.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class ServiceRecordTest < ActiveSupport::TestCase
-  def test_defaults
-    rec = ServiceRecord.new
-
-    assert_equal 1, rec.quantity
-    assert_equal Date.today, rec.date
-
-    # Override defaults
-    rec.quantity = 2
-    rec.date = '2000-01-02'
-    
-    # Before save
-    assert_equal 2, rec.quantity
-    assert_equal DateTime.parse('2000-01-02').strftime('%Y-%m-%d'), rec.date.strftime('%Y-%m-%d')
-  end
-
-  def test_create
-    rec = ServiceRecord.new(:code => '01.0010')
-
-    # Override defaults
-    rec.quantity = 2
-    rec.date = '2000-01-02'
-
-    # Not NULL fields
-    rec.provider = doctors(:test)
-    rec.biller = doctors(:test)
-    rec.responsible = doctors(:test)
-
-    # After save
-    rec.save
-    assert_equal 2, rec.quantity
-    assert_equal DateTime.parse('2000-01-02').strftime('%Y-%m-%d'), rec.date.strftime('%Y-%m-%d')
-    assert_equal '01.0010', rec.code
-  end
-  
-  def test_patient_assignment
-    rec = ServiceRecord.new(:code => '01.0010')
-    patients(:joe).service_records << rec
-    
-    # Now there's a record
-    assert_equal 1, patients(:joe).service_records.size
-
-    # Take provider, biller, responsible from patient
-    assert_equal patients(:joe).doctor, rec.provider
-    assert_equal patients(:joe).doctor, rec.biller
-    assert_equal patients(:joe).doctor, rec.responsible
-  end
-
-  def test_duplicate_record
-    # old_one has a fixtured tarmed record
-    assert_equal 1, patients(:old_one).service_records.size
-
-    rec = ServiceRecord.new(:code => '01.0010')
-    patients(:old_one).service_records << rec
-    
-    # Now there's a second record
-    assert_equal 2, patients(:old_one).service_records.size
-  end
-end
diff --git a/test/unit/session_test.rb b/test/unit/session_test.rb
deleted file mode 100644
index 0de1d5db..00000000
--- a/test/unit/session_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class SessionTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/tariff_code_test.rb b/test/unit/tariff_code_test.rb
deleted file mode 100644
index bc3ad55e..00000000
--- a/test/unit/tariff_code_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class TariffCodeTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/tariff_item_group_test.rb b/test/unit/tariff_item_group_test.rb
deleted file mode 100644
index 3a68e201..00000000
--- a/test/unit/tariff_item_group_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class TariffItemGroupTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/tariff_item_test.rb b/test/unit/tariff_item_test.rb
deleted file mode 100644
index 32f55813..00000000
--- a/test/unit/tariff_item_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TariffItemTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/tiers_test.rb b/test/unit/tiers_test.rb
deleted file mode 100644
index 4d970066..00000000
--- a/test/unit/tiers_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TiersTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/treatment_test.rb b/test/unit/treatment_test.rb
deleted file mode 100644
index 0ae36f29..00000000
--- a/test/unit/treatment_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TreatmentTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/vat_class_test.rb b/test/unit/vat_class_test.rb
deleted file mode 100644
index 2712e633..00000000
--- a/test/unit/vat_class_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class VatClassTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/unit/vcard_test.rb b/test/unit/vcard_test.rb
deleted file mode 100644
index e2c9a0ca..00000000
--- a/test/unit/vcard_test.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-
-include Vcards
-class VcardTest < ActiveSupport::TestCase
-  def test_new
-    empty_new = Vcards::Vcard.new
-    assert_kind_of(Vcards::Vcard, empty_new)
-    
-    empty_new.full_name = 'Empty Name'
-    empty_new.save
-    assert_equal empty_new, Vcards::Vcard.find_by_full_name('Empty Name')
-
-    vcard_new = Vcards::Vcard.new(:full_name => 'Vcard Name', :nickname => 'Nick', :active => true)
-    vcard_new.save
-    assert_kind_of(Vcards::Vcard, vcard_new)
-    
-    address_new = Vcards::Vcard.new(:full_name => 'Address Name', :street_address => 'Strasse 1')
-    address_new.save
-    address_new.reload
-    assert_kind_of(Vcards::Vcard, address_new)
-    assert_equal 'Strasse 1', address_new.street_address
-    
-    address_new.postal_code = "3333"
-    address_new.save
-    address_new.reload
-    assert_equal 'Strasse 1', address_new.street_address
-    assert_equal '3333', address_new.postal_code
-  end
-
-  def test_find
-    assert_equal Vcards::Vcard.find_by_full_name('Full Name'), vcards(:full_name)
-    assert_equal Vcards::Vcard.find_by_full_name('full name'), vcards(:full_name)
-
-    assert_equal Vcards::Vcard.find_by_given_name('John'), vcards(:simple_person)
-    assert_equal Vcards::Vcard.find_all_by_family_name('Doe'), vcards(:us_person, :simple_person)
-  end
-
-  def test_find_by_name
-    assert_equal Vcards::Vcard.find_by_name('John W.'), vcards(:us_person)
-    assert_equal Vcards::Vcard.find_by_name('joe'), vcards(:us_person)
-    assert_equal Vcards::Vcard.find_all_by_name('Doe'), vcards(:us_person, :simple_person)
-  end
-
-  def test_find_collate
-    assert_equal Vcards::Vcard.find_by_name('celine'), vcards(:de_person)
-    assert_equal Vcards::Vcard.find_by_name('Müller'), vcards(:de_person)
-    assert_equal Vcards::Vcard.find_by_name('ändi'), vcards(:de_person)
-  end
-
-  def test_object
-    assert_equal patients(:joe), Vcards::Vcard.find_by_name('Patient').object
-    
-    patient = Patient.new
-    patient.save
-    vcard = Vcards::Vcard.new(:full_name => 'vcard patient')
-    vcard.object = patient
-    vcard.save
-    assert_equal patient, Vcards::Vcard.find_by_name('vcard patient').object
-
-    patient = Patient.new
-    patient.save
-    vcard = Vcards::Vcard.new(:full_name => 'patient vcards')
-    vcard.save
-    patient.vcards << vcard
-    patient.save
-    
-    assert_equal patient, Vcards::Vcard.find_by_name('patient vcards').object
-  end
-
-  def test_active
-    assert_equal Vcards::Vcard.active.count, Vcards::Vcard.count - 1
-  end
-
-  def test_scope_by_name
-    assert_equal [vcards(:patient)], Vcards::Vcard.by_name('Patient')
-    assert_equal 1, Vcards::Vcard.by_name('Patient').count
-    
-    assert_equal 2, Vcards::Vcard.by_name('Doe').count
-  end
-end

From 695038c262885775409207ae6e45f3a1dacc7d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Sat, 10 Jan 2015 01:21:13 +0100
Subject: [PATCH 23/34] Add .ruby-version.

---
 .ruby-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..cd57a8b9
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.1.5

From e7f7614c6aad80382cc6aaa65f437213ee582895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Thu, 15 Jan 2015 09:32:29 +0100
Subject: [PATCH 24/34] Cleanup .gitignore.

---
 .gitignore | 79 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index e30ea9cd..e857e883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,52 +1,65 @@
-# Boring files
-# ============
-*~
-.#*
-_darcs
-DEADJOE
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
 
 # Rails
 # =====
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
-.sass-cache/
-# Vendor
-vendor/cache
-vendor/bundle
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+# Sensitive data.
+.env*
+
+# Ignore coverage report
+/doc/coverage
 
 # Volatile
 doc/api
 doc/app
-public/stylesheets/all.css
+
+# Coverage
+/doc/coverage
+
+# Application
+# ===========
+# Backup
+db/backup
+
+# Data Dumps
+db/data.yml
 
 # Local
 config/database.yml
-system
+data/
+
+# Gems
+# ====
+# carrierwave
+uploads/
 
-# Passenger
-# =========
-tmp/restart.txt
+# guard
+tmp/rspec_guard_result
 
-# Rails Plugins
-# =============
-# restful-authentication
-config/initializers/site_keys.rb
+# capistrano
+config/deploy/*.rb
 
-# carrier-wave
-uploads
+# simplecov
+/doc/coverage
 
-# Sphinx Freetext Search
+# thinking-sphinx
 db/sphinx
 config/*.sphinx.conf
 config/sphinx/
 
-# SwissMatch
+# swissmatch
 config/swissmatch.yml
-
-# CyDoc
-# =====
-data/
-db/backup/
-public/esr_files

From d51f07aaee68cb1f0bed78e3563e7c4f903b949e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 16 Jan 2015 20:17:22 +0100
Subject: [PATCH 25/34] Fix INSTALL to not use sudo for git checkout.0

---
 INSTALL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.textile b/INSTALL.textile
index 14902f1a..1dfc7583 100644
--- a/INSTALL.textile
+++ b/INSTALL.textile
@@ -42,7 +42,7 @@ h2. Install CyDoc
 Install current CyDoc from git repostory. We'll use this checkout as working directory from now on:
 
 <pre>
-sudo git clone http://github.com/huerlisi/CyDoc.git
+git clone http://github.com/huerlisi/CyDoc.git
 cd CyDoc
 </pre>
 

From 6a2f94f53e86dadff9e3aee9a25bc4abb957b890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Fri, 16 Jan 2015 20:17:29 +0100
Subject: [PATCH 26/34] Include devise-i18n gem.

Fixes #14 Missing de-CH translation for authentication messages.
---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index e3e46ec7..47a17674 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,6 +62,7 @@ gem 'in_place_editing'
 # Access Control
 # ==============
 gem 'devise', '~> 2.2' # Changed API
+gem 'devise-i18n'
 gem 'cancan', '1.6.8' # Issue with aliases
 gem 'lyb_devise_admin'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d22b1af8..176ae610 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,6 +113,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    devise-i18n (0.11.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.2.2)
@@ -386,6 +387,7 @@ DEPENDENCIES
   cupsffi
   database_cleaner
   devise (~> 2.2)
+  devise-i18n
   factory_girl_rails
   fastercsv
   haml

From 729a3a1cb38c25e6c50015ac6887616d0afe2726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 2 Feb 2015 17:11:11 +0100
Subject: [PATCH 27/34] Bump .ruby-version to 2.2.0

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index cd57a8b9..ccbccc3d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.5
+2.2.0

From 797d3966f50a3a2be5efab2239e33e510c7e5b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 2 Feb 2015 17:12:03 +0100
Subject: [PATCH 28/34] Drop empty action definition in welcome controller.

---
 app/controllers/welcome_controller.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 4fa53ce9..c69fe7ca 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -1,6 +1,3 @@
 # -*- encoding : utf-8 -*-
 class WelcomeController < ApplicationController
-
-  def index
-  end
 end

From de4eb3e9637496376f418b69358d82e480a187e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 2 Feb 2015 17:17:26 +0100
Subject: [PATCH 29/34] Drop unused "time_field" form builder method.

---
 app/controllers/application_controller.rb | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b68db258..61d282ca 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -85,29 +85,12 @@ def date_field(object_name, method, options = {})
 
         instance_tag.to_input_field_tag("text", options)
       end
-
-      def time_field(object_name, method, options = {})
-        instance_tag = InstanceTag.new(object_name, method, self, options.delete(:object))
-
-        # Let InstanceTag do the object/attribute lookup for us
-        value = instance_tag.value(instance_tag.object)
-
-        # value is empty when re-showing field after error, use params
-        options["value"] =  value.to_s(:text_field) if (value.is_a?(Time) or value.is_a?(DateTime))
-        options["value"] ||= params[object_name][method] if params[object_name]
-
-        instance_tag.to_input_field_tag("text", options)
-      end
     end
 
     class FormBuilder
       def date_field(method, options = {})
         @template.date_field(@object_name, method, objectify_options(options))
       end
-
-      def time_field(method, options = {})
-        @template.time_field(@object_name, method, objectify_options(options))
-      end
     end
   end
 end

From aa73007afef15e9cae9341d21c678fcc165fa714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Mon, 2 Feb 2015 17:22:39 +0100
Subject: [PATCH 30/34] Drop unused date_field extension for FormHelper.

---
 app/controllers/application_controller.rb | 25 -----------------------
 1 file changed, 25 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 61d282ca..f19d97d0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -70,31 +70,6 @@ def regexp_for_sqlite
   end
 end
 
-module ActionView
-  module Helpers
-    module FormHelper
-      def date_field(object_name, method, options = {})
-        instance_tag = InstanceTag.new(object_name, method, self, options.delete(:object))
-
-        # Let InstanceTag do the object/attribute lookup for us
-        value = instance_tag.value(instance_tag.object)
-
-        # value is empty when re-showing field after error, use params
-        options["value"] =  value.to_s(:text_field) if value.is_a?(Date)
-        options["value"] ||= params[object_name][method] if params[object_name]
-
-        instance_tag.to_input_field_tag("text", options)
-      end
-    end
-
-    class FormBuilder
-      def date_field(method, options = {})
-        @template.date_field(@object_name, method, objectify_options(options))
-      end
-    end
-  end
-end
-
 # Monkey patching Date class
 class Date
   # Date helpers

From c3ea1a3fe36a593e421051b4c37ee905a8cdd9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 10 Mar 2015 23:14:11 +0100
Subject: [PATCH 31/34] Use ruby version 2.1.5 which is supported by rails 3.2.

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index ccbccc3d..cd57a8b9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.0
+2.1.5

From fa7ed235e13226161539f98e1f49a65fe67673e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 10 Mar 2015 23:33:01 +0100
Subject: [PATCH 32/34] Pin ledermann-rails-settings to 1.2.0 to fix defaults.

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 47a17674..4a9175f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'aasm'
 gem 'validates_timeliness'
 
 # Application Settings
-gem 'ledermann-rails-settings', '~> 1.2', :require => 'rails-settings' # Changed API
+gem 'ledermann-rails-settings', '1.2.0', :require => 'rails-settings' # Changed API, 1.2.1 broken
 
 # Addresses
 gem 'unicode_utils'
diff --git a/Gemfile.lock b/Gemfile.lock
index 176ae610..13ecf0f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,7 +167,7 @@ GEM
     kgio (2.9.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    ledermann-rails-settings (1.2.1)
+    ledermann-rails-settings (1.2.0)
       activerecord (>= 2.3)
     less (2.6.0)
       commonjs (~> 0.2.7)
@@ -400,7 +400,7 @@ DEPENDENCIES
   inherited_resources
   jquery-rails
   kaminari
-  ledermann-rails-settings (~> 1.2)
+  ledermann-rails-settings (= 1.2.0)
   less-rails
   lyb_devise_admin
   lyb_sidebar

From 128d02049f907e9957485f3c64b81a43cba9c29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Wed, 11 Mar 2015 11:13:44 +0100
Subject: [PATCH 33/34] Ignore all of /log directory.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e857e883..0a79a468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@
 /db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
-/log/*.log
+/log
 /tmp
 
 # Sensitive data.

From 8e1b143f97cdb2241a6ce156af5980e348f49527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Wed, 11 Mar 2015 13:16:54 +0100
Subject: [PATCH 34/34] Fix InsurancePolicy module to not generate stack
 overflows.

---
 app/models/insurance_policy.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/insurance_policy.rb b/app/models/insurance_policy.rb
index 5aac39a0..e4107407 100644
--- a/app/models/insurance_policy.rb
+++ b/app/models/insurance_policy.rb
@@ -5,7 +5,7 @@ class InsurancePolicy < ActiveRecord::Base
 
   # Scopes
   scope :by_policy_type, lambda {|policy_type|
-    {:conditions => {:policy_type => policy_type}}
+    where(:policy_type => policy_type)
   }
 
   # Associations
@@ -15,10 +15,15 @@ class InsurancePolicy < ActiveRecord::Base
   # Validations
 #  validates_presence_of :insurance
 
-  def to_s
-    s = "#{policy_type}: #{insurance.to_s}"
-    s += " ##{number}" unless number.blank?
+  def to_s(format = :default)
+    ident = insurance.to_s
+    ident += " ##{number}" unless number.blank?
 
-    return s
+    case format
+    when :long
+      return "#{policy_type}: #{ident}"
+    else
+      return ident
+    end
   end
 end