diff --git a/app/views/themes/blue2/fetprofiles/show.html.erb b/app/views/themes/blue2/fetprofiles/show.html.erb
index e81955e..e600449 100644
--- a/app/views/themes/blue2/fetprofiles/show.html.erb
+++ b/app/views/themes/blue2/fetprofiles/show.html.erb
@@ -1 +1,3 @@
please remove this from blue2 theme
+ <%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
+
diff --git a/spec/views/fetprofiles/show.html.erb_spec.rb b/spec/views/fetprofiles/show.html.erb_spec.rb
index d8e541c..22a6e65 100644
--- a/spec/views/fetprofiles/show.html.erb_spec.rb
+++ b/spec/views/fetprofiles/show.html.erb_spec.rb
@@ -1,29 +1,13 @@
require 'spec_helper'
-
+#ActionView.lookup_context.prefixes = ['app/views/themes/blue2']
+# ActionView.any_instance.stub!(:view_paths).and_return([ 'app/views/themes/blue2'])
+
describe "fetprofiles/show", :type => :view do
-# include RSpecHtmlMatchers
-include ThemesForRails::CommonMethods
- include ThemesForRails::UrlHelpers
-# include ThemesForRails::ActionController
-
- include ::ThemesForRails::ActionView
- include ::ActionView::Helpers::AssetTagHelper
- include ::ERB::Util
- include ::ActionView::Helpers::TagHelper
- include ::ActionView::Helpers::FormTagHelper
- def theme_name
- 'blue2'
- end
+["blue1", "blue2","2003"].each do |theme|
+describe "theme #{theme}" do
before(:each) do
- view.view_paths.push 'app/views/themes/blue2'
- self.lookup_context.prefixes = ['app/views/themes/blue2']
- view.lookup_context.prefixes.push 'app/views/'
- view= find("fetprofiles/show")
-# view.view_paths.insert 0, ::ActionView::FileSystemResolver.new(theme_view_path_for(name))
-
-# @fetprofile =
- #assign(:fetprofile, stub_model(Fetprofile, FactoryGirl.attributes_for(:fetprofile)))
+ view.view_paths=[ "app/views/themes/#{theme}", "app/views"]
default_url_options[:locale] = :de
@fetprofile = FactoryGirl.create(:fetprofile,:street => "secret adress")
assign(:fetprofile,@fetprofile)
@@ -70,7 +54,7 @@ end
Fetprofile.any_instance.should_not_receive(:gremien)
render
end
-
+
it "renders public attributes" do
render
expect(rendered).to match(/#{@fetprofile.vorname}/)
@@ -93,14 +77,13 @@ end
end
describe "with fet user" do
login_fet_user
- it "can see intern" do
- expect(@ability.can?(:seeintern,@fetprofile)).to be true
- end
let(:current_ability) {@ability}
- it "renders secrets" do
+ it "renders address" do
render
expect(rendered).to match(/#{@fetprofile.street}/)
+ expect(rendered).to match(/#{@fetprofile.plz}/)
+
end
pending "renders edit path" do
render
@@ -108,3 +91,5 @@ let(:current_ability) {@ability}
end
end
end
+end
+end