From 3d87ce6fd2c5d6f44e33b2c70436e970ae14fa89 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sat, 12 Sep 2015 12:03:06 +0200 Subject: [PATCH] AutoCommit Sam Sep 12 12:03:06 CEST 2015 --- spec/models/beispiel_spec.rb | 34 +++++++++++++++------------------- spec/models/gremium_spec.rb | 2 ++ spec/models/lva_spec.rb | 4 ++-- spec/models/modul_spec.rb | 16 +++++++++------- spec/models/neuigkeit_spec.rb | 16 ++++++++-------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/spec/models/beispiel_spec.rb b/spec/models/beispiel_spec.rb index 7066dd1..cc67f20 100644 --- a/spec/models/beispiel_spec.rb +++ b/spec/models/beispiel_spec.rb @@ -14,49 +14,45 @@ describe Beispiel, :type=>:model do # @l.modul << m # @l.save! # end - before(:each) do - @l=lva - @b=FactoryGirl.build(:beispiel) - @b.lva=@l - end + let(:lva){FactoryGirl.build_stubbed(:lva)} + let(:beispiel){FactoryGirl.build(:beispiel, lva: lva)} it "should be created" do - @b.lva=@l - expect{@b.save!; Sunspot.commit}.to change{Beispiel.count}.by(1) + + expect{beispiel.save!; Sunspot.commit}.to change{Beispiel.count}.by(1) end it "is not valid without lva" do b=FactoryGirl.build(:beispiel) expect(b.valid?).to be false end it "responds to comments" do - expect(@b.respond_to?(:comments)).to be true + expect(beispiel.respond_to?(:comments)).to be true end it "responds to get_flag" do - expect(@b.respond_to?(:get_flag)).to be true + expect(beispiel.respond_to?(:get_flag)).to be true end [:delete, :goodquality, :badquality].each do |flg| - it "should have default false for flag #{flg}" do - b=FactoryGirl.create(:beispiel, lva_id: @l.id) + it " has default false for flag #{flg}" do + b=beispiel expect(b.respond_to?(:get_flag)).to be true expect(b.get_flag(flg)).to be false end - it "should respond to flag setter #{flg}" do - # puts "flag_#{flg.to_s}" - expect(@b.respond_to?("flag_#{flg.to_s}".to_sym)).to be true + it "responds to flag setter #{flg}" do + expect(beispiel.respond_to?("flag_#{flg.to_s}".to_sym)).to be true end end it "should be in not_flag beispiele" do - @b.save! + beispiel.save! bsp= Beispiel.not_flag_delete - expect(bsp).to include @b + expect(bsp).to include beispiel end it "should not be in not_flag" do - @b.save! + beispiel.save! bsp= Beispiel.not_flag_delete - expect{@b.flag_delete=true; @b.save!}.to change{ Beispiel.not_flag_delete.count }.by(-1) - expect{@b.flag_delete=nil; @b.save!}.to change{ Beispiel.not_flag_delete.count }.by(1) + expect{beispiel.flag_delete=true; beispiel.save!}.to change{ Beispiel.not_flag_delete.count }.by(-1) + expect{beispiel.flag_delete=nil; beispiel.save!}.to change{ Beispiel.not_flag_delete.count }.by(1) end diff --git a/spec/models/gremium_spec.rb b/spec/models/gremium_spec.rb index effb8f6..cc6d887 100644 --- a/spec/models/gremium_spec.rb +++ b/spec/models/gremium_spec.rb @@ -14,6 +14,8 @@ describe Gremium do g = FactoryGirl.build(:gremium) g.send("#{attr}=".to_sym,nil) expect(g).not_to be_valid + expect(g.errors[attr]).to have_at_least(1).items + end end it "is in tabs if typ is 1 or 3" do diff --git a/spec/models/lva_spec.rb b/spec/models/lva_spec.rb index 4b01478..5766efd 100644 --- a/spec/models/lva_spec.rb +++ b/spec/models/lva_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Lva do +describe Lva, :type=>:model do pending "add some examples to (or delete) #{__FILE__}" let_studium_lva before(:each) do @@ -20,7 +20,7 @@ describe Lva do end end it "should respond to semesters" do -expect(lva).respond_to?(:semesters).to be true + expect(lva.respond_to?(:semester)).to be true end pending "should not be valid without modul" pending "should have beispiele" diff --git a/spec/models/modul_spec.rb b/spec/models/modul_spec.rb index 2bc5894..262b8dd 100644 --- a/spec/models/modul_spec.rb +++ b/spec/models/modul_spec.rb @@ -1,14 +1,16 @@ require 'spec_helper' describe Modul do - it "should not be valid without name" do - m = FactoryGirl.build(:modul) - m.should_not be_valid - m.should have(1).errors_on(:name) + [:name].each do |attr| + it "should not be valid without #{attr}" do + modul = FactoryGirl.build(:modul) + modul.send("#{attr}=".to_sym,nil) + expect(modul).not_to be_valid + expect(modul).to have_at_least(1).errors_on(attr) + end end - it "should be valid with name" do + it "is valid with everything" do m = FactoryGirl.build(:modul) - m.name = "Grundlagen" - m.should be_valid + expect(m).to be_valid end end diff --git a/spec/models/neuigkeit_spec.rb b/spec/models/neuigkeit_spec.rb index 73f07ba..5b7e972 100644 --- a/spec/models/neuigkeit_spec.rb +++ b/spec/models/neuigkeit_spec.rb @@ -3,22 +3,22 @@ require 'spec_helper' describe Neuigkeit do let(:rubrik) {FactoryGirl.create(:rubrik)} let(:user) {FactoryGirl.create(:user)} - [:title,:text, :rubrik_id].each do |attr| + let(:neuigkeit) {(FactoryGirl.build(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id))} + [:title,:text, :rubrik, :author].each do |attr| it "should not be valid without #{attr}" do - fp = FactoryGirl.build(:fetprofile) - fp.send("#{attr}=".to_sym,nil) - fp.should_not be_valid + neuigkeit.send("#{attr}=".to_sym,nil) + expect(neuigkeit).not_to be_valid + expect(neuigkeit.errors[attr]).to have_at_least(1).items end end it "should be created" do - - fp=Fetprofile.new(FactoryGirl.attributes_for(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id)) - expect(fp.save).to be true + expect(neuigkeit).to be_valid + expect(neuigkeit.save).to be true end it "should be valid" do fp = FactoryGirl.build(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id) - fp.should be_valid + expect(fp).to be_valid end pending "is parent for attachments " pending "has questions"