From 984e5f4b56e982f92bcdabce8c1ef49cbc027d92 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Thu, 3 Sep 2015 12:03:05 +0200
Subject: [PATCH] AutoCommit Don Sep  3 12:03:05 CEST 2015

---
 app/views/fetprofiles/show.html.erb           |  2 +-
 .../themes/blue2/fetprofiles/show.html.erb    |  2 +-
 config/routes.rb                              |  7 ++++++-
 spec/factories/gremien.rb                     |  8 ++++---
 spec/factories/memberships.rb                 |  8 +++----
 spec/views/fetprofiles/show.html.erb_spec.rb  | 21 +++++++++++++++++--
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index de3d203..da582a4 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -55,7 +55,7 @@ end
       <ul>
 	<% @memberships.each do |m| %>
 	<li>
-	  <%= link_to m.gremium do %> <%= render m %><% end %>
+	  <%= link_to gremium_path(m.gremium) do %> <%= render m %><% end %>
 	  <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
 	  <%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
 	</li>
diff --git a/app/views/themes/blue2/fetprofiles/show.html.erb b/app/views/themes/blue2/fetprofiles/show.html.erb
index 2d6f85f..26180a8 100644
--- a/app/views/themes/blue2/fetprofiles/show.html.erb
+++ b/app/views/themes/blue2/fetprofiles/show.html.erb
@@ -55,7 +55,7 @@ end
       <ul>
 	<% @memberships.each do |m| %>
 	<li>
-	  <%= link_to m.gremium do %> <%= render m %><% end %>
+	  <%= link_to gremium_path(m.gremium) do %> <%= render m %><% end %>
 	  <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
 	  <%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
 	</li>
diff --git a/config/routes.rb b/config/routes.rb
index 8b404e4..f677317 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,7 +15,12 @@
           get 'internlist'
         end
       end
-
+     resources :gremien do 
+        collection do 
+          get 'verwalten'
+        end
+      end
+#
     # #-------------------------
 
    namespace :survey do
diff --git a/spec/factories/gremien.rb b/spec/factories/gremien.rb
index fcce55d..7e0dba0 100644
--- a/spec/factories/gremien.rb
+++ b/spec/factories/gremien.rb
@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
+
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
   factory :gremium do
-    name "MyString"
-    desc "MyText"
-    typ "MyString"
+    name "Kommission"
+    desc "Das ist eine Kommission die sich mit irgendwas beschäftigt"
+    typ 1
   end
 end
diff --git a/spec/factories/memberships.rb b/spec/factories/memberships.rb
index 56a7e0a..aa3968a 100644
--- a/spec/factories/memberships.rb
+++ b/spec/factories/memberships.rb
@@ -2,10 +2,10 @@
 
 FactoryGirl.define do
   factory :membership do
-    fetprofile_id "MyString"
-    gremium_id "MyString"
+    fetprofile_id 1
+    gremium_id 1
     start "2013-08-19"
-    stop "2013-08-19"
-    typ "MyString"
+    stop "2013-08-23"
+    typ 1
   end
 end
diff --git a/spec/views/fetprofiles/show.html.erb_spec.rb b/spec/views/fetprofiles/show.html.erb_spec.rb
index bca5af1..080add3 100644
--- a/spec/views/fetprofiles/show.html.erb_spec.rb
+++ b/spec/views/fetprofiles/show.html.erb_spec.rb
@@ -13,8 +13,12 @@ describe "fetprofiles/show", :type => :view  do
     default_url_options[:locale] = :de
     @fetprofile =  FactoryGirl.create(:fetprofile_withadress)
     assign(:fetprofile,@fetprofile)
-    assign(:memberships, [])
-    assign(:gremientabs, [])
+      @gremium =  FactoryGirl.create(:gremium)
+      @gremium2 =  FactoryGirl.create(:gremium, name:"Kommission2")
+      @gremium3 =  FactoryGirl.create(:gremium, name:"Kommission3", typ: 2)
+
+    assign(:memberships, [FactoryGirl.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)])
+    assign(:gremientabs, [@gremium2])
 #    view.theme "blue2"
   end
   def self.login_fet_user
@@ -82,6 +86,19 @@ end
       expect(rendered).not_to match(/#{@fetprofile.plz}/)
 
   end
+  it  "renders links to gremium" do
+    render
+    expect(rendered).to match(/#{gremium_path(@gremium)}/)
+  end
+  it  "renders  gremium links"  do
+    render
+    expect(rendered).to match(/#{gremium_path(@gremium2)}/)
+  end
+  it  "doesn't render  gremium links for hidden gremium"  do
+    render
+    expect(rendered).not_to match(/#{gremium_path(@gremium3)}/)
+  end
+
   describe "with fet user" do 
     login_fet_user