From 6b324ded443d19f43561c83ae1384cdb91be5c1c Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 30 Aug 2015 20:03:01 +0200 Subject: [PATCH] AutoCommit Son Aug 30 20:03:01 CEST 2015 --- .../fetprofiles_controller_spec.rb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spec/controllers/fetprofiles_controller_spec.rb b/spec/controllers/fetprofiles_controller_spec.rb index 49e8ce3..bef4193 100644 --- a/spec/controllers/fetprofiles_controller_spec.rb +++ b/spec/controllers/fetprofiles_controller_spec.rb @@ -1,20 +1,21 @@ require 'spec_helper' describe FetprofilesController, :type=> :controller do - include Devise::TestHelpers + include Devise::TestHelpers, type: :contoller let(:valid_attributes) { {"vorname"=>"Neuer Vorname"} } let(:valid_session) { {locale: :de} } describe "GET index" do + let(:action) { get :index, {}, valid_session} it "has a 200 status code" do - get :index, {locale: "de"} + action expect(response.status).to eq(200) end it "assigns all fetprofiles as @fetprofiles" do fetprofile = FactoryGirl.create(:fetprofile, :active=>true) - get :index, {}, valid_session - assigns(:fetprofiles).should eq([fetprofile]) + action + expect(assigns(:fetprofiles)).to eq([fetprofile]) end end @@ -42,29 +43,28 @@ describe FetprofilesController, :type=> :controller do end describe "POST create" do - before(:each) do - u= FactoryGirl.create(:user) + let(:action){post :create, {:fetprofile => FactoryGirl.build(:fetprofile).attributes.slice(:vorname, :nachname,:desc)}} + before(:all) do + u= FactoryGirl.build(:user) + u=User.last u.add_role(:fetuser) sign_in u end describe "with valid params" do it "creates a new Fetprofile" do - expect { - post :create, {:fetprofile => FactoryGirl.create(:fetprofile).attributes.slice(:vorname, :nachname,:desc)}, valid_session - }.to change(Fetprofile, :count).by(1) + + expect(action).to change(Fetprofile, :count).by(1) end - it "assigns a newly created fetprofile as @fetprofile" do - post :create, {:fetprofile => FactoryGirl.create(:fetprofile).attributes.slice(:vorname, :nachname,:desc)}, valid_session - assigns(:fetprofile).should be_a(Fetprofile) + action + assigns(:fetprofile).to be_a(Fetprofile) assigns(:fetprofile).should be_persisted end it "redirects to the created fetprofile" do - post :create, {:fetprofile => FactoryGirl.create(:fetprofile).attributes}, valid_session - response.should redirect_to(Fetprofile.last) + expect(action).to redirect_to(Fetprofile.last) end end