From 353894911de9bb850eb0e8ee759cbf8a3f5a857f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20de=20Villamil?=
 <frederic@de-villamil.com>
Date: Sat, 12 Oct 2013 09:38:54 +0200
Subject: [PATCH] Fixes profiles rendering that would crash despite being
 tested.

Calling render_views should be done in all controller specs to ensure that something does not crash, otherwise, errors in the .erb files won't raise (just like now).
---
 app/views/admin/users/_form.html.erb               | 7 ++++---
 spec/controllers/admin/profiles_controller_spec.rb | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index c56f56d8f2..680b7b8775 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -121,26 +121,27 @@
 </fieldset>
 
 <% unless controller.controller_name == 'users'%>
+
 <fieldset class='form-horizontal'>
   <legend><%= _("Publish on Twitter")%></legend>
   <%= twitter_disabled_message(this_blog, current_user) %>
   <div class='control-group'>
     <label class='control-label' for="user_twitter_account"><%= _("Twitter account")%></label>
     <div class='controls'>
-      <%= text_field('user', 'twitter_account', {:class => 'span5', :disabled => disabled }) %>
+      <%= text_field('user', 'twitter_account', {class: 'span5', disabled: twitter_available?(this_blog, current_user)}) %>
       <p class='help-block'>The Twitter account you want to post with</p>
     </div>
   </div>
   <div class='control-group'>
     <label class='control-label' for="user_twitter_oauth_token"><%= _("Twitter oauth token")%></label>
     <div class='controls'>
-      <%= text_field('user', 'twitter_oauth_token', {:class => 'span5', :disabled => disabled}) %>
+      <%= text_field('user', 'twitter_oauth_token', {class: 'span5', disabled: twitter_available?(this_blog, current_user)}) %>
     </div>
   </div>
   <div class='control-group'>
     <label class='control-label' for="user_twitter_oauth_token_secret"><%= _("Twitter oauth secret")%></label>
     <div class='controls'>
-      <%= text_field('user', 'twitter_oauth_token_secret', {:class => 'span5', :disabled => disabled}) %>
+      <%= text_field('user', 'twitter_oauth_token_secret', {class: 'span5', disabled: twitter_available?(this_blog, current_user)}) %>
     </div>
   </div>
 </fieldset>
diff --git a/spec/controllers/admin/profiles_controller_spec.rb b/spec/controllers/admin/profiles_controller_spec.rb
index d61289039d..50d1f9b1d5 100644
--- a/spec/controllers/admin/profiles_controller_spec.rb
+++ b/spec/controllers/admin/profiles_controller_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Admin::ProfilesController do
+  render_views
   let!(:blog) { create(:blog) }
 
   let(:alice) { create(:user, login: 'alice', profile: create(:profile_admin, label: Profile::ADMIN)) }