Merge branch 'master' of https://github.com/HausdorffHimself/fetsite

db/migrate/20130729085446_create_lva_semester_join_table.rb

@@ -4,18 +4,11 @@ class CreateLvaSemesterJoinTable < ActiveRecord::Migration
       t.integer  :lva_id
       t.integer  :semester_id
     end
-    add_index :lva_semesters, [:lva_id, :semester_id]
-    add_index :lva_semesters, :semester_id
-  end
-  def change
-    create_table :lvas_semesters, :id=>false do |t|
-      t.integer  :lva_id
-      t.integer  :semester_id
-    end
-    add_index :lva_semesters, [:lva_id, :semester_id]
-    add_index :lva_semesters, :semester_id
+    add_index :lvas_semesters, [:lva_id, :semester_id]
+    add_index :lvas_semesters, :semester_id
   end
+
   def self.down
-    drop_table :lva_semesters
+    drop_table :lvas_semesters
   end
 end

spec/factories/studien.rb

@@ -3,7 +3,7 @@
 
 FactoryGirl.define do  
   factory :studium do
-    zahl  "066.506"
+    zahl  "066506"
     name  "Automatisierung"
     desc  "TEST DESC"
     typ "Master"