From 1dd995a763490cefdc411efeb6972eaf48e57089 Mon Sep 17 00:00:00 2001
From: Jan-Willem van der Meer <mail@jewilmeer.nl>
Date: Tue, 12 Aug 2014 17:56:29 +0200
Subject: [PATCH] Move tests as well, remove public namespace from controller

---
 app/controllers/unsubscribes_controller.rb    | 42 +++++++++----------
 .../unsubscribes_controller_spec.rb           |  2 +-
 2 files changed, 21 insertions(+), 23 deletions(-)
 rename spec/controllers/{public => }/unsubscribes_controller_spec.rb (94%)

diff --git a/app/controllers/unsubscribes_controller.rb b/app/controllers/unsubscribes_controller.rb
index b58a1a524d..aeb60ccfbe 100644
--- a/app/controllers/unsubscribes_controller.rb
+++ b/app/controllers/unsubscribes_controller.rb
@@ -1,24 +1,22 @@
-module Public
-  class UnsubscribesController < ApplicationController
-    skip_before_filter :authenticate_user!,
-                       :reject_blocked, :set_current_user_for_observers,
-                       :add_abilities
-    layout 'public_users'
+class UnsubscribesController < ApplicationController
+  skip_before_filter :authenticate_user!,
+                     :reject_blocked, :set_current_user_for_observers,
+                     :add_abilities
+  layout 'public_users'
 
-    def show
-      @user = get_user
-    end
-
-    def create
-      @user = get_user
-      @user.admin_unsubscribe! if @user
-      redirect_to new_user_session_path, notice: 'You have been unsubscribed'
-    end
-
-    protected
-    def get_user
-      @email = "#{params[:email]}.#{params[:format]}"
-      User.where(email: @email).first
-    end
+  def show
+    @user = get_user
   end
-end
\ No newline at end of file
+
+  def create
+    @user = get_user
+    @user.admin_unsubscribe! if @user
+    redirect_to new_user_session_path, notice: 'You have been unsubscribed'
+  end
+
+  protected
+  def get_user
+    @email = "#{params[:email]}.#{params[:format]}"
+    User.where(email: @email).first
+  end
+end
diff --git a/spec/controllers/public/unsubscribes_controller_spec.rb b/spec/controllers/unsubscribes_controller_spec.rb
similarity index 94%
rename from spec/controllers/public/unsubscribes_controller_spec.rb
rename to spec/controllers/unsubscribes_controller_spec.rb
index 242e41e599..04f46d611d 100644
--- a/spec/controllers/public/unsubscribes_controller_spec.rb
+++ b/spec/controllers/unsubscribes_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Public::UnsubscribesController do
+describe UnsubscribesController do
   let!(:user) { create :user, email: 'me@example.com' }
 
   describe "show" do