From 3260bada3832f185412077c3c897a379e2b42ce2 Mon Sep 17 00:00:00 2001 From: Braulio Martinez Date: Wed, 7 Nov 2012 23:14:35 -0200 Subject: [PATCH 1/3] Remove posts#new action from Rails and related tests --- app/controllers/posts_controller.rb | 4 ---- app/views/status_messages/new_bookmarklet.haml | 5 ----- config/routes.rb | 2 -- spec/controllers/status_messages_controller_spec.rb | 7 ------- 4 files changed, 18 deletions(-) delete mode 100644 app/views/status_messages/new_bookmarklet.haml diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 59c6d46ed..886ccc4bd 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -24,10 +24,6 @@ class PostsController < ApplicationController end end - def new - redirect_to "/stream" - end - def show mark_corresponding_notification_read if user_signed_in? diff --git a/app/views/status_messages/new_bookmarklet.haml b/app/views/status_messages/new_bookmarklet.haml deleted file mode 100644 index 74c4be115..000000000 --- a/app/views/status_messages/new_bookmarklet.haml +++ /dev/null @@ -1,5 +0,0 @@ --# Copyright (c) 2010-2012, Diaspora Inc. This file is --# licensed under the Affero General Public License version 3 or later. See --# the COPYRIGHT file. - -%iframe{:src =>"/posts/new", :height => 500, :width => 980, :style => "border:none;"} \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6ae77aca4..89f2e91d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,8 +28,6 @@ Diaspora::Application.routes.draw do resources :comments, :only => [:new, :create, :destroy, :index] end - match "/framer" => redirect("/posts/new") - get 'p/:id' => 'posts#show', :as => 'short_post' get 'posts/:id/iframe' => 'posts#iframe', :as => 'iframe' diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index 3ef5e9361..a97ca33ff 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -53,13 +53,6 @@ describe StatusMessagesController do end end - describe '#new_bookmarklet' do - it 'works' do - get :new_bookmarklet - response.should be_success - end - end - describe '#new' do it 'succeeds' do get :new, From 36c7c00550d588af9cc36fe3ddd36624384aa09d Mon Sep 17 00:00:00 2001 From: Braulio Martinez Date: Wed, 7 Nov 2012 23:15:38 -0200 Subject: [PATCH 2/3] Remove unused posts#new action from Backbone --- app/assets/javascripts/app/router.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index a4e86a729..1e9a19425 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -1,7 +1,6 @@ app.Router = Backbone.Router.extend({ routes: { //new hotness - "posts/new" : "composer", "posts/:id": "singlePost", "posts/:id/next": "siblingPost", "posts/:id/previous": "siblingPost", @@ -25,10 +24,6 @@ app.Router = Backbone.Router.extend({ "u/:name": "stream" }, - composer : function(){ - this.renderPage(function(){ return new app.pages.Composer()}); - }, - singlePost : function(id) { this.renderPage(function(){ return new app.pages.PostViewer({ id: id })}); }, From ab3a7d991c5fbe7a9476d1c1ee365187df08ced2 Mon Sep 17 00:00:00 2001 From: Braulio Martinez Date: Wed, 7 Nov 2012 23:16:25 -0200 Subject: [PATCH 3/3] Remove ugly whitespaces --- .../controllers/status_messages_controller_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index a97ca33ff..ac76ad6cc 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -34,7 +34,7 @@ describe StatusMessagesController do doc.xpath('//head').count.should equal 1 doc.xpath('//body').count.should equal 1 - save_fixture(html_for('body'), 'empty_bookmarklet') + save_fixture(html_for('body'), 'empty_bookmarklet') end it 'accepts get params' do @@ -84,35 +84,35 @@ describe StatusMessagesController do response.status.should == 302 response.should be_redirect end - + it 'creates with invalid html' do post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 }) response.status.should == 302 response.should be_redirect end - + it 'creates with valid json' do post :create, status_message_hash.merge(:format => 'json') response.status.should == 201 end - + it 'creates with invalid json' do post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 }, :format => 'json') response.status.should == 403 end - + it 'creates with valid mobile' do post :create, status_message_hash.merge(:format => 'mobile') response.status.should == 302 response.should be_redirect end - + it 'creates with invalid mobile' do post :create, status_message_hash.merge(:status_message => { :text => "0123456789" * 7000 }, :format => 'mobile') response.status.should == 302 response.should be_redirect end - + it 'removes getting started from new users' do @controller.should_receive(:remove_getting_started) post :create, status_message_hash