Adding fake_app with specs

2 files changed, 6 insertions, 24 deletions

diff --git a/app/controllers/inboxes/base_controller.rb b/app/controllers/inboxes/base_controller.rb
index f1e77b1..3e3f8dc 100644
--- a/app/controllers/inboxes/base_controller.rb
+++ b/app/controllers/inboxes/base_controller.rb
@@ -5,9 +5,7 @@ class Inboxes::BaseController < ApplicationController
     @discussion = Discussion.find(params[:discussion_id])
   end
 
-  # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
   def current_ability
-    # raise "Loading Ability"
     @current_ability ||= Inboxes::Ability.new(current_user)
   end
 end
\ No newline at end of file
diff --git a/app/controllers/inboxes/discussions_controller.rb b/app/controllers/inboxes/discussions_controller.rb
index 04a8edd..52655e2 100644
--- a/app/controllers/inboxes/discussions_controller.rb
+++ b/app/controllers/inboxes/discussions_controller.rb
@@ -1,31 +1,21 @@
 class Inboxes::DiscussionsController < Inboxes::BaseController
   load_and_authorize_resource
-  # before_filter :authenticate_user!
-  # before_filter :init_and_check_permissions, :only => :show
   before_filter :load_and_check_discussion_recipient, :only => [:create, :new]
 
   def index
     @discussions = current_user.discussions
   end
-
-  # GET /discussions/1
-  # GET /discussions/1.json
+  
   def show
     # @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
     @discussion.mark_as_read_for(current_user)
   end
-
-  # GET /discussions/new
-  # GET /discussions/new.json
+  
   def new
-    # @discussion = Discussion.new
     @discussion.messages.build
   end
-
-  # POST /discussions
-  # POST /discussions.json
+  
   def create
-    # @discussion = Discussion.new(params[:discussion])
     @discussion.add_recipient_token current_user.id
 
     @discussion.messages.each do |m|
@@ -41,16 +31,10 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   end
 
   private
-
-  # def init_and_check_permissions
-  #   @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
-  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-  # end
-
+  
   def load_and_check_discussion_recipient
     # initializing model for new and create actions
     @discussion = Discussion.new(params[:discussion].presence || {})
-    # @discussion.recipient_tokens = params[:recipients] if params[:recipients] # pre-population
 
     # checking if discussion with this user already exists
     if @discussion.recipient_ids && @discussion.recipient_ids.size == 1
@@ -61,8 +45,8 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
         @discussion.messages.each do |message|
           Message.create(:discussion => discussion, :user => current_user, :body => message.body) if message.body
         end
-        # перекидываем на нее
-        redirect_to discussion_url(discussion), :notice => t("inboxes.discussions.exists", :user => user[Inboxes::config.user_name])
+        # redirecting to this discussion page
+        redirect_to discussion_url(discussion), :notice => t("inboxes.discussions.already_exists", :user => user[Inboxes::config.user_name])
       end
     end
   end