diff --git a/app/controllers/vanna_controller.rb b/app/controllers/vanna_controller.rb index f3997de7f..06852dc39 100644 --- a/app/controllers/vanna_controller.rb +++ b/app/controllers/vanna_controller.rb @@ -14,6 +14,7 @@ class VannaController < Vanna::Base include ActionController::Flash default_url_options[:host] = "localhost" include ActionController::MobileFu::InstanceMethods + include ActionController::RackDelegation helper_method :is_mobile_device? protect_from_forgery :except => :receive diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index e25248aa4..134d01303 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -32,9 +32,7 @@ #new_status_message_pane .span-15.last - #facebox_header - %h4 - =t('bookmarklet.post_something') - + %h4 + =t('bookmarklet.post_something') = render :partial => 'shared/publisher', :locals => { :aspect => :profile, :aspects_with_person => @aspects, :aspect_ids => @aspect_ids} diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb index 5b744d9c5..6b30aa8bf 100644 --- a/spec/controllers/admins_controller_spec.rb +++ b/spec/controllers/admins_controller_spec.rb @@ -100,6 +100,11 @@ describe AdminsController do AppConfig[:admins] = [@user.username] end + it 'succeeds' do + get :admin_inviter, :identifier => 'bob@moms.com' + response.should be_ok + end + it 'invites a new user' do Invitation.should_receive(:create_invitee).with(:service => 'email', :identifier => 'bob@moms.com') get :admin_inviter, :identifier => 'bob@moms.com'