From 2311b761e14225d86c1acc2e02825d47ef7b6ab5 Mon Sep 17 00:00:00 2001 From: Hincu Petru Date: Tue, 8 Apr 2014 09:27:02 +0000 Subject: [PATCH] Redirect to stream_path if is destkop --- app/controllers/status_messages_controller.rb | 6 ++++-- spec/controllers/status_messages_controller_spec.rb | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 4ed6dd53170..c20b2976f5e 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -29,11 +29,13 @@ def new @contacts_of_contact = @contact.contacts render :layout => nil end - else + elsif(request.format == :mobile) @aspect = :all @aspects = current_user.aspects @aspect_ids = @aspects.map{ |a| a.id } gon.aspect_ids = @aspect_ids + else + redirect_to stream_path end end @@ -125,4 +127,4 @@ def normalize_public_flag! def remove_getting_started current_user.disable_getting_started end -end \ No newline at end of file +end diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index ea0443b670e..f354e02b806 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -58,6 +58,11 @@ def pass_test_args(text='cute kitty') response.should be_success end + it 'should redirect on desktop version' do + get :new + response.should redirect_to(stream_path) + end + it 'generates a jasmine fixture', :fixture => true do contact = alice.contact_for(bob.person) aspect = alice.aspects.create(:name => 'people')