diff --git a/spec/controllers/gremien_controller_spec.rb b/spec/controllers/gremien_controller_spec.rb
index 7719266..03dfc6b 100644
--- a/spec/controllers/gremien_controller_spec.rb
+++ b/spec/controllers/gremien_controller_spec.rb
@@ -1,141 +1,179 @@
 require 'spec_helper'
 
-describe GremienController, :type => :view do
-  let(:valid_update_attributes) { { "name" => "MyString" } }
+describe GremienController, :type => :controller  do
+  let(:valid_update_attributes) { {"name"=>"NeuesGremium"}  }
+  #  let(:valid_session) { {locale: :de} }
 
   def self.create_gremium
     before(:each) do
       @gremium = FactoryGirl.create(:gremium)    
     end
   end
+#  def self.create_active_gremium
+#    before(:each) do
+#      @gremium = FactoryGirl.create(:gremium, active: true)    
+#    end
+#  end
+
+  let(:object_variable) {:gremium}    
+  let(:assigned_object_variable) {@gremium}
+  let(:object_class) {Gremium}
 
   describe "GET index" do
     create_gremium
-    subject(:action) { get :index, {} }
-    it "assigns all gremien as @gremien" do
-      expect(assigns(:gremien)).to eq([@gremium])
-    end
+    subject(:action) {  get :index, {} }
+    let(:object_variable) {:gremien}    
+    let(:assigned_object_variable) {[@gremium]}
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"  
   end
 
   describe "GET show" do
     create_gremium
-    subject(:action) {get :show, {:id => gremium.to_param}} 
-    it "assigns the requested gremium as @gremium" do
-      expect(assigns(:gremium)).to eq(gremium)
-    end
+    subject(:action) { get :show, {:id => @gremium.to_param}}
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"
+      it "renders the 'show' template" do
+        expect(action).to render_template("show")
+      end
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
   end
 
   describe "GET new" do
     subject(:action) { get :new, {}}
-
-    it "assigns a new gremium as @gremium" do
-
-      assigns(:gremium).should be_a_new(Gremium)
+    describe "with fetuser" do
+      login_fet_user
+      it_behaves_like "it assigns new object"
+      it_behaves_like "it is success"  
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "GET edit" do
+
+    subject(:action) {get :edit, :id=>@gremium.to_param}
+    login_fet_user
+    create_gremium
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
     it "assigns the requested gremium as @gremium" do
-      gremium = Gremium.create! valid_attributes
-      get :edit, {:id => gremium.to_param}, valid_session
-      assigns(:gremium).should eq(gremium)
+      expect{action}.to change {assigns(:gremium)}.to(@gremium)
+ #     expect(assigns(:gremium)).to eq(@gremium)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+    
   end
 
   describe "POST create" do
-    describe "with valid params" do
-      it "creates a new Gremium" do
-        expect {
-          post :create, {:gremium => valid_attributes}, valid_session
-        }.to change(Gremium, :count).by(1)
-      end
+    subject(:action){post :create, {:gremium => FactoryGirl.attributes_for(:gremium),:format=>:html}}
 
-      it "assigns a newly created gremium as @gremium" do
-        post :create, {:gremium => valid_attributes}, valid_session
-        assigns(:gremium).should be_a(Gremium)
-        assigns(:gremium).should be_persisted
+    login_fet_user
+    describe "with valid params" do
+
+      it "has a 302 status code" do
+        expect(action.status).to eq(302)
+      end      
+      it "creates a new Gremium" do
+        expect{action}.to change(Gremium, :count).by(1)
       end
+      
+      it_behaves_like "it assigns persisted object"
+
 
       it "redirects to the created gremium" do
-        post :create, {:gremium => valid_attributes}, valid_session
-        response.should redirect_to(Gremium.last)
+        expect(action).to redirect_to assigns(:gremium)
       end
     end
 
     describe "with invalid params" do
-      it "assigns a newly created but unsaved gremium as @gremium" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        post :create, {:gremium => { "name" => "invalid value" }}, valid_session
-        assigns(:gremium).should be_a_new(Gremium)
-      end
+      has_invalid_params
+   
 
+      it "assigns a newly created but unsaved gremium as @gremium" do
+        action
+        assigns(:gremium).should be_a_new(Gremium)
+        expect(assigns(:gremium)).not_to be_persisted
+      end
       it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        post :create, {:gremium => { "name" => "invalid value" }}, valid_session
-        response.should render_template("new")
+        expect(action).to render_template("new")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "PUT update" do
-    describe "with valid params" do
-      it "updates the requested gremium" do
-        gremium = Gremium.create! valid_attributes
-        # Assuming there are no other gremien in the database, this
-        # specifies that the Gremium created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        Gremium.any_instance.should_receive(:update_attributes).with({ "name" => "MyString" })
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "MyString" }}, valid_session
-      end
+    let(:action) { put :update, {:id => @gremium.to_param, :gremium => {"name"=>"neuerName"}} }
+    
+    create_gremium
+    login_fet_user
 
-      it "assigns the requested gremium as @gremium" do
-        gremium = Gremium.create! valid_attributes
-        put :update, {:id => gremium.to_param, :gremium => valid_attributes}, valid_session
-        assigns(:gremium).should eq(gremium)
+    describe "with valid params" do
+      it_behaves_like "it assigns object"
+
+      it "updates the requested gremium" do
+       expect { action }.to change{Gremium.find(@gremium.id).name}.to("neuerName")
       end
+      it_behaves_like "it assigns persisted object"
 
       it "redirects to the gremium" do
-        gremium = Gremium.create! valid_attributes
-        put :update, {:id => gremium.to_param, :gremium => valid_attributes}, valid_session
-        response.should redirect_to(gremium)
+        expect(action).to redirect_to(@gremium)
       end
     end
 
     describe "with invalid params" do
-      it "assigns the gremium as @gremium" do
-        gremium = Gremium.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "invalid value" }}, valid_session
-        assigns(:gremium).should eq(gremium)
-      end
-
+      has_invalid_params
+      it_behaves_like "it assigns object"
       it "re-renders the 'edit' template" do
-        gremium = Gremium.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "invalid value" }}, valid_session
-        response.should render_template("edit")
+        expect(action).to render_template("edit")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
   end
 
   describe "DELETE destroy" do
+    login_fet_user
+    create_gremium
+    subject(:action) { delete :destroy, {:id => @gremium.to_param}}
+
     it "destroys the requested gremium" do
-      gremium = Gremium.create! valid_attributes
       expect {
-        delete :destroy, {:id => gremium.to_param}, valid_session
+       action
       }.to change(Gremium, :count).by(-1)
     end
 
     it "redirects to the gremien list" do
-      gremium = Gremium.create! valid_attributes
-      delete :destroy, {:id => gremium.to_param}, valid_session
+      action
       response.should redirect_to(gremien_url)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
 end
+