From cfb42584e1daa65d164d0bdc2c07e03a40c19089 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 12 Sep 2015 11:03:02 +0200
Subject: [PATCH] AutoCommit Sam Sep 12 11:03:02 CEST 2015

---
 Gemfile                             |  2 +-
 spec/models/beispiel_spec.rb        | 36 +++++++++++++++--------------
 spec/models/crawlobject_spec.rb     |  2 +-
 spec/models/document_spec.rb        |  2 +-
 spec/models/key_spec.rb             |  2 +-
 spec/models/lva_spec.rb             | 36 ++++++++++++-----------------
 spec/models/meeting_spec.rb         |  2 +-
 spec/models/meetingtyp_spec.rb      |  2 +-
 spec/models/modulgruppe_spec.rb     |  6 +++--
 spec/models/survey/answer_spec.rb   |  2 +-
 spec/models/survey/choice_spec.rb   |  2 +-
 spec/models/survey/question_spec.rb |  2 +-
 spec/models/user_spec.rb            |  2 ++
 spec/spec_helper.rb                 | 10 ++++++--
 spec/support/model_macros.rb        | 18 +++++++++++++++
 15 files changed, 75 insertions(+), 51 deletions(-)
 create mode 100644 spec/support/model_macros.rb

diff --git a/Gemfile b/Gemfile
index 35e99ad..326bfca 100755
--- a/Gemfile
+++ b/Gemfile
@@ -86,7 +86,7 @@ gem 'annotate', ">=2.5.0"
 gem 'carrierwave', "~>0.9.0"
 group :development, :test do 
 gem 'factory_girl_rails',"~>4.5.0"
-#gem 'minitest', "~>4.7.5"
+gem 'minitest', "~>4.7.5"
 gem 'progress_bar'
 gem 'rspec-core', '~>3.3.0'
 gem 'rspec-rails', '~>3.3.0'
diff --git a/spec/models/beispiel_spec.rb b/spec/models/beispiel_spec.rb
index c32600e..7066dd1 100644
--- a/spec/models/beispiel_spec.rb
+++ b/spec/models/beispiel_spec.rb
@@ -1,19 +1,21 @@
 require 'spec_helper'
 
-describe Beispiel do
-  before(:each) do
-    s=FactoryGirl.create(:studium)
-    mg=FactoryGirl.build(:modulgruppe)
-    mg.studium= s
-    mg.save!
-    m=FactoryGirl.build(:other_modul)
-    m.modulgruppen << mg
-    m.save!
-    @l=FactoryGirl.build(:lva)  
-    @l.modul << m
-    @l.save!
-  end
+describe Beispiel, :type=>:model do
+  let_studium_lva
+#  before(:each) do
+#    s=FactoryGirl.create(:studium)
+#    mg=FactoryGirl.create(:modulgruppe, studium_id: s.id)#
+
+#    m=FactoryGirl.build(:other_modul)
+#    m.modulgruppen << mg
+#    m.save!
+
+#    @l=FactoryGirl.build(:lva)  
+#    @l.modul << m
+#    @l.save!
+#  end
   before(:each) do 
+    @l=lva
     @b=FactoryGirl.build(:beispiel)
     @b.lva=@l
   end
@@ -22,14 +24,14 @@ describe Beispiel do
     @b.lva=@l
     expect{@b.save!; Sunspot.commit}.to change{Beispiel.count}.by(1)
   end
-  it "should not be valid without lva" do
+  it "is not valid without lva" do
     b=FactoryGirl.build(:beispiel)
     expect(b.valid?).to be false
   end
-  it "should respond to comments" do
+  it "responds to comments" do
     expect(@b.respond_to?(:comments)).to be true
   end
-  it "should respond to get_flag" do
+  it "responds to get_flag" do
     expect(@b.respond_to?(:get_flag)).to be true
   end
   [:delete, :goodquality, :badquality].each do |flg|
@@ -40,7 +42,7 @@ describe Beispiel do
     end
 
   it "should respond to flag setter #{flg}" do
-      puts "flag_#{flg.to_s}"
+     # puts "flag_#{flg.to_s}"
     expect(@b.respond_to?("flag_#{flg.to_s}".to_sym)).to be true
   end  
 end 
diff --git a/spec/models/crawlobject_spec.rb b/spec/models/crawlobject_spec.rb
index 23b9039..87b4ecd 100644
--- a/spec/models/crawlobject_spec.rb
+++ b/spec/models/crawlobject_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Crawlobject  do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
index d39f418..20eb7f2 100644
--- a/spec/models/document_spec.rb
+++ b/spec/models/document_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Document, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index f94d28a..ae283cf 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Key, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/lva_spec.rb b/spec/models/lva_spec.rb
index 435b2ed..4b01478 100644
--- a/spec/models/lva_spec.rb
+++ b/spec/models/lva_spec.rb
@@ -2,32 +2,26 @@ require 'spec_helper'
 
 describe Lva do
   pending "add some examples to (or delete) #{__FILE__}"
-  before(:all) do
-    s=FactoryGirl.create(:studium)
-    mg=FactoryGirl.build(:modulgruppe)
-    mg.studium= s
-    mg.save!
-    @m=FactoryGirl.build(:other_modul)
-    @m.modulgruppen << mg
-    @m.save!
-    puts "Beispiele before filter"
-  end
+  let_studium_lva
   before(:each) do 
     @l = FactoryGirl.build(:lva)
   end
-  it "should be created" do
-    l=FactoryGirl.build(:lva)  
-    l.modul << @m
-    expect{l.save!; Sunspot.commit}.to change{Lva.count}.by(1)
-  end
-  it "should not be valid without module" do
-    l=FactoryGirl.build(:lva)
-    expect(l.valid?).to be false
-    expect(l.errors[:modul].size).to be(1)
+  describe "if bare"  do
+    let(:lva) {FactoryGirl.build(:lva)}
+    it "should be created" do
+      l=lva
+      l.modul << modul
+      expect{l.save!; Sunspot.commit}.to change{Lva.count}.by(1)
+    end
+    it "should not be valid without module" do
+      l=lva
+      expect(l.valid?).to be false
+      expect(l.errors[:modul].size).to be(1)
+    end
   end
   it "should respond to semesters" do
-@l
-end
+expect(lva).respond_to?(:semesters).to be true
+  end
   pending "should not be valid without modul"
   pending "should have beispiele"
   pending "should be flagable"
diff --git a/spec/models/meeting_spec.rb b/spec/models/meeting_spec.rb
index 93d55f7..2e72528 100644
--- a/spec/models/meeting_spec.rb
+++ b/spec/models/meeting_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Meeting, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/meetingtyp_spec.rb b/spec/models/meetingtyp_spec.rb
index c55d7c0..09545ef 100644
--- a/spec/models/meetingtyp_spec.rb
+++ b/spec/models/meetingtyp_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Meetingtyp, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/modulgruppe_spec.rb b/spec/models/modulgruppe_spec.rb
index 3a863e3..d06d7bf 100644
--- a/spec/models/modulgruppe_spec.rb
+++ b/spec/models/modulgruppe_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Modulgruppe do
+describe Modulgruppe, :type =>:model do
   it "should not be valid without studium" do
   mg=FactoryGirl.build(:modulgruppe)
   mg.should_not be_valid
@@ -42,5 +42,7 @@ describe Modulgruppe do
   mg.should be_valid
 
   end    
-  
+    pending "add some examples to (or delete) #{__FILE__}"
+  pending "DRY #{__FILE__}"
+
 end
diff --git a/spec/models/survey/answer_spec.rb b/spec/models/survey/answer_spec.rb
index 518fae0..7dcc5dc 100644
--- a/spec/models/survey/answer_spec.rb
+++ b/spec/models/survey/answer_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Survey::Answer, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/survey/choice_spec.rb b/spec/models/survey/choice_spec.rb
index 2923d52..46d24ce 100644
--- a/spec/models/survey/choice_spec.rb
+++ b/spec/models/survey/choice_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Survey::Choice, :type => :model do
   pending "picture"
diff --git a/spec/models/survey/question_spec.rb b/spec/models/survey/question_spec.rb
index bb98bdc..5f26dd3 100644
--- a/spec/models/survey/question_spec.rb
+++ b/spec/models/survey/question_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Survey::Question, :type => :model do
   pending "have choices"
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0f54532..1888364 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,4 +1,6 @@
 require 'spec_helper'
 
 describe User do
+  pending "add some examples to (or delete) #{__FILE__}"
+
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 90d68f8..f283b59 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,13 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+require 'rbconfig'
+
 require File.expand_path("../../config/environment", __FILE__)
+#require 'rspec/autorun'
 require 'rspec/rails'
-require 'rspec/autorun'
-# require 'minitest/autorun'
+
+
+#require 'minitest/autorun'
 require 'sunspot_test/rspec' 
 require 'devise'
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -15,6 +19,8 @@ Dir[Rails.root.join("spec/controllers/shared_examples/**/*.rb")].each {|f| requi
 RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.extend ControllerMacros, :type => :controller
+  config.extend ModelMacros, :type => :model
+
   config.include Devise::TestHelpers, :type => :view
   config.include RSpecHtmlMatchers, :type => :view
  config.extend ViewMacros, :type => :view
diff --git a/spec/support/model_macros.rb b/spec/support/model_macros.rb
new file mode 100644
index 0000000..5da7d1d
--- /dev/null
+++ b/spec/support/model_macros.rb
@@ -0,0 +1,18 @@
+module ModelMacros
+  def let_studium_lva
+    let(:studium) {FactoryGirl.create(:studium)}
+    let(:modulgruppe){FactoryGirl.create(:modulgruppe,studium_id: studium.id)}
+    let(:modul) do
+      m=FactoryGirl.build(:other_modul);
+      m.modulgruppen << modulgruppe
+      m.save!
+      m
+    end
+    let(:lva) do
+      l=FactoryGirl.build(:lva)  
+      l.modul << modul
+      l.save!
+      l
+    end
+  end
+end