From 5134dc2e5fed38c92226345c78131d15ca202c46 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 1 Sep 2015 13:03:03 +0200 Subject: [PATCH] AutoCommit Die Sep 1 13:03:03 CEST 2015 --- .../themes/blue2/fetprofiles/show.html.erb | 1 + spec/views/fetprofiles/show.html.erb_spec.rb | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/views/themes/blue2/fetprofiles/show.html.erb diff --git a/app/views/themes/blue2/fetprofiles/show.html.erb b/app/views/themes/blue2/fetprofiles/show.html.erb new file mode 100644 index 0000000..e81955e --- /dev/null +++ b/app/views/themes/blue2/fetprofiles/show.html.erb @@ -0,0 +1 @@ +
please remove this from blue2 theme
diff --git a/spec/views/fetprofiles/show.html.erb_spec.rb b/spec/views/fetprofiles/show.html.erb_spec.rb index 3f289e4..d8e541c 100644 --- a/spec/views/fetprofiles/show.html.erb_spec.rb +++ b/spec/views/fetprofiles/show.html.erb_spec.rb @@ -2,7 +2,26 @@ require 'spec_helper' 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 + 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))) default_url_options[:locale] = :de @@ -10,6 +29,7 @@ describe "fetprofiles/show", :type => :view do assign(:fetprofile,@fetprofile) assign(:memberships, []) assign(:gremientabs, []) +# view.theme "blue2" end def self.login_fet_user before(:each) do @@ -26,6 +46,9 @@ describe "fetprofiles/show", :type => :view do sign_in user end end + it "has working filters" do + expect(true).to be true + end it "calls vorname on fetprofile" do expect(@fetprofile).to receive(:vorname).at_least(1).times @@ -79,7 +102,7 @@ let(:current_ability) {@ability} render expect(rendered).to match(/#{@fetprofile.street}/) end - it "renders edit path" do + pending "renders edit path" do render expect(rendered).to match(/#{edit_fetprofile_path(@fetprofile)}/) end