Merge pull request #521 from shingara/refactor/problem_controller

Refactor/problem controller

Merge pull request #521 from shingara/refactor/problem_controller
Refactor/problem controller
Cyril Mougel
2 parents f2e95433 c7507da1
Showing 35 changed files with 489 additions and 340 deletions Show diff stats
.gitignore
Gemfile
Gemfile.lock
app/controllers/apps_controller.rb
app/controllers/problems_controller.rb
app/controllers/problems_searcher.rb
app/helpers/apps_helper.rb
app/helpers/sort_helper.rb
app/interactors/issue_creation.rb
app/models/issue_tracker.rb
app/views/apps/_fields.html.haml
app/views/apps/edit.html.haml
app/views/apps/index.html.haml
app/views/apps/new.html.haml
app/views/apps/show.atom.builder
app/views/apps/show.html.haml
app/views/problems/_issue_tracker_links.html.haml
app/views/problems/_list.atom.builder
app/views/problems/_table.html.haml
app/views/problems/index.html.haml
@@ -18,3 +18,4 @@ bin
 bundle
 coverage
 *#
+.ruby-version
@@ -11,7 +11,6 @@ gem &#39;htmlentities&#39;
 gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
 gem 'useragent'
-gem 'inherited_resources'
 gem 'decent_exposure'
 gem 'strong_parameters'
 gem 'SystemTimer', :platform => :ruby_18
@@ -123,6 +123,7 @@ GEM
       multipart-post (~> 1.1)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
+    ffi (1.9.0)
     flowdock (0.3.1)
       httparty (~> 0.7)
       multi_json
@@ -133,7 +134,6 @@ GEM
       tilt
     happymapper (0.4.0)
       libxml-ruby (~> 2.0)
-    has_scope (0.5.1)
     hashie (1.2.0)
     highline (1.6.19)
     hike (1.2.3)
@@ -151,9 +151,6 @@ GEM
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
     i18n (0.6.1)
-    inherited_resources (1.4.0)
-      has_scope (~> 0.5.0)
-      responders (~> 0.9)
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
@@ -288,8 +285,6 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    responders (0.9.3)
-      railties (~> 3.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     ri_cal (0.8.8)
@@ -412,7 +407,6 @@ DEPENDENCIES
   hoptoad_notifier (~> 2.4)
   htmlentities
   httparty
-  inherited_resources
   jquery-rails (~> 2.1.4)
   kaminari (>= 0.14.1)
   launchy
-class AppsController < InheritedResources::Base
+class AppsController < ApplicationController
+
+  include ProblemsSearcher
+
   before_filter :require_admin!, :except => [:index, :show]
   before_filter :parse_email_at_notices_or_set_default, :only => [:create, :update]
   before_filter :parse_notice_at_notices_or_set_default, :only => [:create, :update]
   respond_to :html
-  def show
-    respond_to do |format|
-      format.html do
-        @all_errs = !!params[:all_errs]
+  expose(:app_scope) {
+    (current_user.admin? ? App : current_user.apps)
+  }
+
+  expose(:apps) {
+    app_scope.all.sort
+  }
+
+  expose(:app, :ancestor => :app_scope)
+
+  expose(:all_errs) {
+    !!params[:all_errs]
+  }
+  expose(:problems) {
+    if request.format == :atom
+      app.problems.unresolved.ordered
+    else
+      pr = app.problems
+      pr = pr.unresolved unless all_errs
+      pr.in_env(
+        params[:environment]
+      ).ordered_by(params_sort, params_order).page(params[:page]).per(current_user.per_page)
+    end
+  }
-        @sort  = params[:sort]
-        @order = params[:order]
-        @sort  = "last_notice_at" unless %w{message app last_deploy_at last_notice_at count}.member?(@sort)
-        @order = "desc" unless %w{asc desc}.member?(@order)
+  expose(:deploys) {
+    app.deploys.order_by(:created_at.desc).limit(5)
+  }
-        @problems = resource.problems
-        @problems = @problems.unresolved unless @all_errs
-        @problems = @problems.in_env(params[:environment]).ordered_by(@sort, @order).page(params[:page]).per(current_user.per_page)
+  def index; end
+  def show
+    app
+  end
-        @selected_problems = params[:problems] || []
-        @deploys = @app.deploys.order_by(:created_at.desc).limit(5)
-      end
-      format.atom do
-        @problems = resource.problems.unresolved.ordered
-      end
-    end
+  def new
+    plug_params(app)
   end
   def create
-    @app = App.new(params[:app])
     initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
-    create!
+    if app.save
+      redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.create.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.create.error')
+      render :new
+    end
   end
   def update
-    @app = resource
     initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
-    update!
+    if app.save
+      redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.update.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.update.error')
+      render :edit
+    end
   end
-  def new
-    plug_params(build_resource)
-    new!
+  def edit
+    plug_params(app)
   end
-  def edit
-    plug_params(resource)
-    edit!
+  def destroy
+    if app.destroy
+      redirect_to apps_url, :flash => { :success => I18n.t('controllers.apps.flash.destroy.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.destroy.error')
+      render :show
+    end
   end
   protected
-    def collection
-      @apps ||= end_of_association_chain.all.sort
-    end
     def initialize_subclassed_issue_tracker
       # set the app's issue tracker
       if params[:app][:issue_tracker_attributes] && tracker_type = params[:app][:issue_tracker_attributes][:type]
         if IssueTracker.subclasses.map(&:name).concat(["IssueTracker"]).include?(tracker_type)
-          @app.issue_tracker = tracker_type.constantize.new(params[:app][:issue_tracker_attributes])
+          app.issue_tracker = tracker_type.constantize.new(params[:app][:issue_tracker_attributes])
         end
       end
     end
@@ -69,21 +95,11 @@ class AppsController &lt; InheritedResources::Base
       # set the app's notification service
       if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
         if NotificationService.subclasses.map(&:name).concat(["NotificationService"]).include?(notification_type)
-          @app.notification_service = notification_type.constantize.new(params[:app][:notification_service_attributes])
+          app.notification_service = notification_type.constantize.new(params[:app][:notification_service_attributes])
         end
       end
     end
-    def begin_of_association_chain
-      # Filter the @apps collection to apps watched by the current user, unless user is an admin.
-      # If user is an admin, then no filter is applied, and all apps are shown.
-      current_user unless current_user.admin?
-    end
-
-    def interpolation_options
-      {:app_name => resource.name}
-    end
-
     def plug_params app
       app.watchers.build if app.watchers.none?
       app.issue_tracker = IssueTracker.new unless app.issue_tracker_configured?
+##
+# Manage problems
+#
+# List of actions available :
+# MEMBER => :show, :edit, :update, :create, :destroy, :resolve, :unresolve, :create_issue, :unlink_issue
+# COLLECTION => :index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search
 class ProblemsController < ApplicationController
-  before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search]
-  before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search]
-  before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
-  before_filter :set_sorting_params, :only => [:index, :all, :search]
-  before_filter :set_tracker_params, :only => [:create_issue]
-
-  def index
-    app_scope = current_user.admin? ? App.all : current_user.apps
-    @all_errs = params[:all_errs]
-    @problems = Problem.for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(@all_errs).ordered_by(@sort, @order)
-    @selected_problems = params[:problems] || []
-    respond_to do |format|
-      format.html do
-        @problems = @problems.page(params[:page]).per(current_user.per_page)
-      end
-      format.atom
+
+
+  include ProblemsSearcher
+
+  before_filter :need_selected_problem, :only => [
+    :resolve_several, :unresolve_several, :unmerge_several
+  ]
+
+  expose(:app) {
+    if current_user.admin?
+      App.find(params[:app_id])
+    else
+      current_user.apps.find(params[:app_id])
     end
-  end
+  }
+
+  expose(:problem) {
+    app.problems.find(params[:id])
+  }
+
+
+  expose(:all_errs) {
+    params[:all_errs]
+  }
+
+  expose(:app_scope) {
+    apps = current_user.admin? ? App.all : current_user.apps
+    params[:app_id] ? apps.where(:_id => params[:app_id]) : apps
+  }
+
+  expose(:params_environement) {
+    params[:environment]
+  }
+
+  expose(:problems) {
+    pro = Problem.for_apps(
+      app_scope
+    ).in_env(
+      params_environement
+    ).all_else_unresolved(all_errs).ordered_by(params_sort, params_order)
+
+    if request.format == :html
+      pro.page(params[:page]).per(current_user.per_page)
+    else
+      pro
+    end
+  }
+
+  def index; end
   def show
-    @notices  = @problem.notices.reverse_ordered.page(params[:notice]).per(1)
+    @notices  = problem.notices.reverse_ordered.page(params[:notice]).per(1)
     @notice   = @notices.first
     @comment = Comment.new
   end
   def create_issue
-    issue_creation = IssueCreation.new(@problem, current_user, params[:tracker])
+    IssueTracker.update_url_options(request)
+    issue_creation = IssueCreation.new(problem, current_user, params[:tracker])
     unless issue_creation.execute
-      flash[:error] = issue_creation.errors[:base].first
+      flash[:error] = issue_creation.errors.full_messages.join(', ')
     end
-    redirect_to app_problem_path(@app, @problem)
+    redirect_to app_problem_path(app, problem)
   end
   def unlink_issue
-    @problem.update_attribute :issue_link, nil
-    redirect_to app_problem_path(@app, @problem)
+    problem.update_attribute :issue_link, nil
+    redirect_to app_problem_path(app, problem)
   end
   def resolve
-    @problem.resolve!
+    problem.resolve!
     flash[:success] = 'Great news everyone! The err has been resolved.'
     redirect_to :back
   rescue ActionController::RedirectBackError
-    redirect_to app_path(@app)
+    redirect_to app_path(app)
   end
   def resolve_several
-    @selected_problems.each(&:resolve!)
-    flash[:success] = "Great news everyone! #{I18n.t(:n_errs_have, :count => @selected_problems.count)} been resolved."
+    selected_problems.each(&:resolve!)
+    flash[:success] = "Great news everyone! #{I18n.t(:n_errs_have, :count => selected_problems.count)} been resolved."
     redirect_to :back
   end
   def unresolve_several
-    @selected_problems.each(&:unresolve!)
-    flash[:success] = "#{I18n.t(:n_errs_have, :count => @selected_problems.count)} been unresolved."
+    selected_problems.each(&:unresolve!)
+    flash[:success] = "#{I18n.t(:n_errs_have, :count => selected_problems.count)} been unresolved."
     redirect_to :back
   end
+  ##
+  # Action to merge several Problem in One problem
+  #
+  # @param [ Array<String> ] :problems the list of problem ids
+  #
   def merge_several
-    if @selected_problems.length < 2
-      flash[:notice] = "You must select at least two errors to merge"
+    if selected_problems.length < 2
+      flash[:notice] = I18n.t('controllers.problems.flash.need_two_errors_merge')
     else
-      @merged_problem = Problem.merge!(@selected_problems)
-      flash[:notice] = "#{@selected_problems.count} errors have been merged."
+      ProblemMerge.new(selected_problems).merge
+      flash[:notice] = I18n.t('controllers.problems.flash.merge_several.success', :nb => selected_problems.count)
     end
     redirect_to :back
   end
   def unmerge_several
-    all = @selected_problems.map(&:unmerge!).flatten
+    all = selected_problems.map(&:unmerge!).flatten
     flash[:success] = "#{I18n.t(:n_errs_have, :count => all.length)} been unmerged."
     redirect_to :back
   end
   def destroy_several
-    nb_problem_destroy = ProblemDestroy.execute(@selected_problems)
+    nb_problem_destroy = ProblemDestroy.execute(selected_problems)
     flash[:notice] = "#{I18n.t(:n_errs_have, :count => nb_problem_destroy)} been deleted."
     redirect_to :back
   end
   def search
-    if params[:app_id]
-      app_scope = App.where(:_id => params[:app_id])
-    else
-      app_scope = current_user.admin? ? App.all : current_user.apps
-    end
-    @problems = Problem.search(params[:search]).for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(params[:all_errs]).ordered_by(@sort, @order)
+    @problems = Problem.search(params[:search]).for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(params[:all_errs]).ordered_by(params_sort, params_order)
     @selected_problems = params[:problems] || []
     @problems = @problems.page(params[:page]).per(current_user.per_page)
     render :content_type => 'text/javascript'
   end
   protected
-    def find_app
-      @app = App.find(params[:app_id])
-
-      # Mongoid Bug: could not chain: current_user.apps.find_by_id!
-      # apparently finding by 'watchers.email' and 'id' is broken
-      raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? || current_user.watching?(@app)
-    end
-    def find_problem
-      @problem = @app.problems.find(params[:id])
-    end
-
-    def set_tracker_params
-      IssueTracker.default_url_options[:host] = request.host
-      IssueTracker.default_url_options[:port] = request.port
-      IssueTracker.default_url_options[:protocol] = request.scheme
-    end
-
-    def find_selected_problems
-      err_ids = (params[:problems] || []).compact
-      if err_ids.empty?
-        flash[:notice] = "You have not selected any errors"
-        redirect_to :back
-      else
-        @selected_problems = Array(Problem.find(err_ids))
-      end
-    end
-
-    def set_sorting_params
-      @sort = params[:sort]
-      @sort = "last_notice_at" unless %w{app message last_notice_at last_deploy_at count}.member?(@sort)
-      @order = params[:order] || "desc"
+  ##
+  # Redirect :back if no errors selected
+  #
+  def need_selected_problem
+    if err_ids.empty?
+      flash[:notice] = I18n.t('controllers.problems.flash.no_select_problem')
+      redirect_to :back
     end
+  end
 end
@@ -0,0 +1,34 @@
+# Include to do a Search
+# TODO: Need to be in a Dedicated Object ProblemsSearch with params like input
+#
+module ProblemsSearcher
+  extend ActiveSupport::Concern
+
+  included do
+
+    expose(:params_sort) {
+      unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort])
+        "last_notice_at"
+      else
+        params[:sort]
+      end
+    }
+
+    expose(:params_order){
+      unless %w{asc desc}.member?(params[:order])
+        'desc'
+      else
+        params[:order]
+      end
+    }
+
+    expose(:selected_problems) {
+      Array(Problem.find(err_ids))
+    }
+
+    expose(:err_ids) {
+      (params[:problems] || []).compact
+    }
+
+  end
+end
@@ -41,7 +41,7 @@ module AppsHelper
   def detect_any_apps_with_attributes
     @any_github_repos = @any_issue_trackers = @any_deploys = @any_bitbucket_repos = @any_notification_services = false
-    @apps.each do |app|
+    apps.each do |app|
       @any_github_repos   ||= app.github_repo?
       @any_bitbucket_repos   ||= app.bitbucket_repo?
       @any_issue_trackers ||= app.issue_tracker_configured?
 # encoding: utf-8
 module SortHelper
-  
+
   def link_for_sort(name, field=nil)
     field ||= name.underscore
-    current = (@sort == field)
-    order   = (current && (@order == "asc")) ? "desc" : "asc"
+    current = (params_sort == field)
+    order   = (current && (params_order == "asc")) ? "desc" : "asc"
     url     = request.path + "?sort=#{field}&order=#{order}"
     options = {}
     options.merge!(:class => "current #{order}") if current
     link_to(name, url, options)
   end
-  
+
 end
@@ -41,15 +41,11 @@ class IssueCreation
   end
   def execute
-    if tracker
-      begin
-        tracker.create_issue problem, user
-      rescue => ex
-        Rails.logger.error "Error during issue creation: " << ex.message
-        errors.add :base, "There was an error during issue creation: #{ex.message}"
-      end
-    end
-
+    tracker.create_issue problem, user if tracker
     errors.empty?
+  rescue => ex
+    Rails.logger.error "Error during issue creation: " << ex.message
+    errors.add :base, "There was an error during issue creation: #{ex.message}"
+    false
   end
 end
@@ -40,4 +40,15 @@ class IssueTracker
   def configured?
     project_id.present?
   end
+
+  ##
+  # Update default_url_option with valid data from the request information
+  #
+  # @param [ Request ] a request with host, port and protocol
+  #
+  def self.update_url_options(request)
+    IssueTracker.default_url_options[:host] = request.host
+    IssueTracker.default_url_options[:port] = request.port
+    IssueTracker.default_url_options[:protocol] = request.scheme
+  end
 end
-= errors_for @app
+= errors_for app
 %div.required
   = f.label :name
 - content_for :title, 'Edit App'
 - content_for :action_bar do
   = link_to_copy_attributes_from_other_app
-  = link_to 'destroy application', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
-  = link_to('cancel', app_path(@app), :class => 'button')
+  = link_to 'destroy application', app_path(app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
+  = link_to('cancel', app_path(app), :class => 'button')
-= form_for @app do |f|
+= form_for app do |f|
   = render 'fields', :f => f
@@ -16,7 +16,7 @@
         %th Last Deploy
       %th Errors
   %tbody
-    - @apps.each do |app|
+    - apps.each do |app|
       %tr
         %td.name= link_to app.name, app_path(app)
         - if any_github_repos? or any_bitbucket_repos?
@@ -50,7 +50,7 @@
           - if app.problem_count > 0
             - unresolved = app.unresolved_count
             = link_to unresolved, app_path(app), :class => (unresolved == 0 ? "resolved" : nil)
-    - if @apps.none?
+    - if apps.none?
       %tr
         %td{:colspan => 3}
           %em
@@ -3,7 +3,7 @@
   = link_to_copy_attributes_from_other_app
   = link_to('cancel', apps_path, :class => 'button')
-= form_for @app do |f|
+= form_for app do |f|
   = render 'fields', :f => f
 atom_feed do |feed|
-  feed.title("Errbit notices for #{h @app.name} at #{root_url}")
+  feed.title("Errbit notices for #{h app.name} at #{root_url}")
   render "problems/list", :feed => feed
 end
-- content_for :title, @app.name
+- content_for :title, app.name
 - content_for :head do
-  = auto_discovery_link_tag :atom, app_path(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{request.host}"
+  = auto_discovery_link_tag :atom, app_path(app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{app.name} at #{request.host}"
 - content_for :meta do
   %strong Errors Caught:
-  = @app.problems.count
+  = app.problems.count
   %strong Deploy Count:
-  = @app.deploys.count
+  = app.deploys.count
   %strong API Key:
-  = @app.api_key
+  = app.api_key
 - content_for :action_bar do
   - if current_user.admin?
-    = link_to 'edit', edit_app_path(@app), :class => 'button'
-  - if @all_errs
-    = link_to 'unresolved errs', app_path(@app), :class => 'button'
+    = link_to 'edit', edit_app_path(app), :class => 'button'
+  - if all_errs
+    = link_to 'unresolved errs', app_path(app), :class => 'button'
   - else
-    = link_to 'all errs', app_path(@app, :all_errs => true), :class => 'button'
+    = link_to 'all errs', app_path(app, :all_errs => true), :class => 'button'
 %h3#watchers_toggle
   Watchers
   %span.click_span (show/hide)
 #watchers_div
-  - if @app.notify_all_users
+  - if app.notify_all_users
     %table.watchers
       %thead
         %tr
@@ -31,15 +31,15 @@
         %tr
           %th User or Email
       %tbody
-        - @app.watchers.each do |watcher|
+        - app.watchers.each do |watcher|
           %tr
             %td= watcher.label
-        - if @app.watchers.none?
+        - if app.watchers.none?
           %tr
             %td
               %em Sadly, no one is watching this app
-- if @app.github_repo?
+- if app.github_repo?
   %h3#repository_toggle
     Repository
     %span.click_span (show/hide)
@@ -50,13 +50,13 @@
           %th GitHub Repo
       %tbody
         %tr
-          %td= link_to(@app.github_repo, @app.github_url, :target => '_blank')
+          %td= link_to(app.github_repo, app.github_url, :target => '_blank')
 %h3#deploys_toggle
   Latest Deploys
   %span.click_span (show/hide)
 #deploys_div
-  - if @deploys.any?
+  - if deploys.any?
     %table.deploys
       %thead
         %tr
@@ -68,7 +68,7 @@
           %th Revision
       %tbody
-        - @deploys.each do |deploy|
+        - deploys.each do |deploy|
           %tr
             %td.when #{deploy.created_at.to_s(:micro)}
             %td.environment #{deploy.environment}
@@ -76,20 +76,20 @@
             %td.message #{deploy.message}
             %td.repository #{deploy.repository}
             %td.revision #{deploy.short_revision}
-    = link_to "All Deploys (#{@app.deploys.count})", app_deploys_path(@app), :class => 'button'
+    = link_to "All Deploys (#{app.deploys.count})", app_deploys_path(app), :class => 'button'
   - else
     %h3 No deploys
-- if @app.problems.any?
+- if app.problems.any?
   %h3.clear Errors
   %section
-    = form_tag search_problems_path(:all_errs => @all_errs, :app_id => @app.id), :method => :get, :remote => true do
+    = form_tag search_problems_path(:all_errs => all_errs, :app_id => app.id), :method => :get, :remote => true do
       = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
   %br
   %section
     .problem_table{:id => 'problem_table'}
-      = render 'problems/table', :problems => @problems
+      = render 'problems/table', :problems => problems
 - else
   %h3.clear No errs have been caught yet, make sure you setup your app
-  = render 'configuration_instructions', :app => @app
+  = render 'configuration_instructions', :app => app
-- if @app.issue_tracker_configured? || current_user.github_account?
-  - if @problem.issue_link.present?
-    %span= link_to 'go to issue', @problem.issue_link, :class => "#{@problem.issue_type}_goto goto-issue"
-    = link_to 'unlink issue', unlink_issue_app_problem_path(@app, @problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
-  - elsif @problem.issue_link == "pending"
-    %span.disabled= link_to 'creating...', '#', :class => "#{@problem.issue_type}_inactive create-issue"
-    = link_to 'retry', create_issue_app_problem_path(@app, @problem), :method => :post
+- if app.issue_tracker_configured? || current_user.github_account?
+  - if problem.issue_link.present?
+    %span= link_to 'go to issue', problem.issue_link, :class => "#{problem.issue_type}_goto goto-issue"
+    = link_to 'unlink issue', unlink_issue_app_problem_path(app, problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
+  - elsif problem.issue_link == "pending"
+    %span.disabled= link_to 'creating...', '#', :class => "#{problem.issue_type}_inactive create-issue"
+    = link_to 'retry', create_issue_app_problem_path(app, problem), :method => :post
   - else
-    - if @app.github_repo?
+    - if app.github_repo?
       - if current_user.can_create_github_issues?
-        %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
-      - elsif @app.issue_tracker_configured? && @app.issue_tracker.label.eql?('github')
-        %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem), :method => :post, :class => "github_create create-issue"
-    - if @app.issue_tracker_configured? && !@app.issue_tracker.label.eql?('github')
-      %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem), :method => :post, :class => "#{@app.issue_tracker.label}_create create-issue"
+        %span= link_to 'create issue', create_issue_app_problem_path(app, problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
+      - elsif app.issue_tracker_configured? && app.issue_tracker.label.eql?('github')
+        %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "github_create create-issue"
+    - if app.issue_tracker_configured? && !app.issue_tracker.label.eql?('github')
+      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.label}_create create-issue"
-feed.updated(@problems.first.try(:created_at) || Time.now)
+feed.updated(problems.first.try(:created_at) || Time.now)
-for problem in @problems
+for problem in problems
   notice = problem.notices.first
-  feed.entry(problem, :url => app_problem_url(problem.app, problem)) do |entry|
+  feed.entry(problem, :url => app_problem_url(problem.app.to_param, problem.to_param)) do |entry|
     entry.title "[#{ problem.where }] #{problem.message.to_s.truncate(27)}"
     entry.author do |author|
       author.name "#{ problem.app.name } [#{ problem.environment }]"
@@ -16,7 +16,7 @@
       - problems.each do |problem|
         %tr{:class => problem.resolved? ? 'resolved' : 'unresolved'}
           %td.select
-            = check_box_tag "problems[]", problem.id, @selected_problems.member?(problem.id.to_s)
+            = check_box_tag "problems[]", problem.id, selected_problems.member?(problem.id.to_s)
           %td.app
             = link_to problem.app.name, app_path(problem.app)
             - if current_page?(:controller => 'problems')
 - content_for :title, @all_errs ? 'All Errors' : 'Unresolved Errors'
 - content_for :head do
   = auto_discovery_link_tag :atom, problems_path(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{request.host}"
+
 - content_for :action_bar do
   - if @all_errs
     = link_to 'hide resolved', problems_path, :class => 'button'
   - else
     = link_to 'show resolved', problems_path(:all_errs => true), :class => 'button'
+
 %section
   = form_tag search_problems_path(:all_errs => @all_errs), :method => :get, :remote => true do
     = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
 %br
 %section
-  .problem_table{:id => 'problem_table'}
-    = render 'problems/table', :problems => @problems
+  #problem_table.problem_table
+    = render 'problems/table'
-- content_for :page_title, @problem.message
+- content_for :page_title, problem.message
 - content_for :title_css_class, 'err_show'
-- content_for :title, @problem.error_class || truncate(@problem.message, :length => 32)
+- content_for :title, problem.error_class || truncate(problem.message, :length => 32)
 - content_for :meta do
   %strong App:
-  = link_to @app.name, @app
+  = link_to app.name, app
   %strong Where:
-  = @problem.where
+  = problem.where
   %br
   %strong Environment:
-  = @problem.environment
+  = problem.environment
   %strong Last Notice:
-  = @problem.last_notice_at.to_s(:precise)
+  = problem.last_notice_at.to_s(:precise)
 - content_for :action_bar do
-  - if @problem.unresolved?
-    %span= link_to 'resolve', [:resolve, @app, @problem], :method => :put, :data => { :confirm => problem_confirm }, :class => 'resolve'
+  - if problem.unresolved?
+    %span= link_to 'resolve', [:resolve, app, problem], :method => :put, :data => { :confirm => problem_confirm }, :class => 'resolve'
   - if current_user.authentication_token
-    %span= link_to 'iCal', polymorphic_path([@app, @problem], :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
-  %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_problems_path(@app)), :class => 'up'
+    %span= link_to 'iCal', polymorphic_path([app, problem], :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
+  %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_problems_path(app)), :class => 'up'
   %br
   = render "issue_tracker_links"
-- if @problem.comments_allowed? || @problem.comments.any?
+- if problem.comments_allowed? || problem.comments.any?
   - content_for :comments do
     %h3 Comments
-    - @problem.comments.each do |comment|
+    - problem.comments.each do |comment|
       .window
         %table.comment
           %tr
@@ -37,11 +37,11 @@
               - else
                 %span.comment-info
                   = time_ago_in_words(comment.created_at, true) << " ago by [Unknown User]"
-              %span.delete= link_to '&#10008;'.html_safe, [@app, @problem, comment], :method => :delete, :data => { :confirm => "Are you sure you don't need this comment?" }, :class => "destroy-comment"
+              %span.delete= link_to '&#10008;'.html_safe, [app, problem, comment], :method => :delete, :data => { :confirm => "Are you sure you don't need this comment?" }, :class => "destroy-comment"
           %tr
             %td= simple_format comment.body
-    - if @problem.comments_allowed?
-      = form_for [@app, @problem, @comment] do |comment_form|
+    - if problem.comments_allowed?
+      = form_for [app, problem, @comment] do |comment_form|
         %p Add a comment
         = comment_form.text_area :body
         = comment_form.submit "Save Comment"
@@ -63,7 +63,7 @@
 - if @notice
   #summary
     %h3 Summary
-    = render 'notices/summary', :notice => @notice, :problem => @problem
+    = render 'notices/summary', :notice => @notice
   #backtrace
     %h3 Backtrace
-= generate_problem_ical(@problem.notices.order_by(:created_at.asc))
+= generate_problem_ical(problem.notices.order_by(:created_at.asc))
@@ -1,2 +0,0 @@
-InheritedResources.flash_keys = [:success, :error]
-
@@ -2,7 +2,6 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
-  hello: "Hello world"
   flash:
     apps:
       create:
@@ -11,6 +10,7 @@ en:
         success: "Good news everyone! '%{app_name}' was successfully updated."
       destroy:
         success: "'%{app_name}' was successfully destroyed."
+
   n_errs_have:
     one:   "%{count} err has"
     other: "%{count} errs have"
@@ -31,6 +31,18 @@ en:
       edit_profile: 'Edit profile'
   controllers:
+    apps:
+      flash:
+        create:
+          success: "Your app was successfully created."
+          error:  "You app was successfully destroyed."
+        update:
+          success: "You app was successfully updated."
+          error: "You app was not updated"
+        destroy:
+          success: "You app was successfully destroyed."
+          error: "You app could not be destroyed."
+
     users:
       flash:
         destroy:
@@ -38,6 +50,13 @@ en:
           error: "You can't delete yourself"
         update:
           success: "%{name}'s information was successfully updated."
+    problems:
+      flash:
+        no_select_problem: "You have not selected any errors"
+        need_two_errors_merge: "You must select at least two errors to merge"
+        merge_several:
+          success: "%{nb} errors have been merged."
+
   devise:
     registrations:
@@ -6,15 +6,13 @@ describe AppsController do
   it_requires_authentication
   it_requires_admin_privileges :for => {:new => :get, :edit => :get, :create => :post, :update => :put, :destroy => :delete}
-
   describe "GET /apps" do
     context 'when logged in as an admin' do
       it 'finds all apps' do
         sign_in Fabricate(:admin)
         3.times { Fabricate(:app) }
-        apps = App.all
         get :index
-        assigns(:apps).should == apps
+        controller.apps.should == App.all.sort.entries
       end
     end
@@ -27,8 +25,8 @@ describe AppsController do
         Fabricate(:user_watcher, :user => user, :app => watched_app1)
         Fabricate(:user_watcher, :user => user, :app => watched_app2)
         get :index
-        assigns(:apps).should include(watched_app1, watched_app2)
-        assigns(:apps).should_not include(unwatched_app)
+        controller.apps.should include(watched_app1, watched_app2)
+        controller.apps.should_not include(unwatched_app)
       end
     end
   end
@@ -44,7 +42,7 @@ describe AppsController do
       it 'finds the app' do
         get :show, :id => @app.id
-        assigns(:app).should == @app
+        controller.app.should == @app
       end
       it "should not raise errors for app with err without notices" do
@@ -65,13 +63,13 @@ describe AppsController do
         it "should have default per_page value for user" do
           get :show, :id => @app.id
-          assigns(:problems).to_a.size.should == User::PER_PAGE
+          controller.problems.to_a.size.should == User::PER_PAGE
         end
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :show, :id => @app.id
-          assigns(:problems).to_a.size.should == 10
+          controller.problems.to_a.size.should == 10
         end
       end
@@ -85,14 +83,14 @@ describe AppsController do
         context 'and no params' do
           it 'shows only unresolved problems' do
             get :show, :id => @app.id
-            assigns(:problems).size.should == 1
+            controller.problems.size.should == 1
           end
         end
         context 'and all_problems=true params' do
           it 'shows all errors' do
             get :show, :id => @app.id, :all_errs => true
-            assigns(:problems).size.should == 2
+            controller.problems.size.should == 2
           end
         end
       end
@@ -108,35 +106,35 @@ describe AppsController do
         context 'no params' do
           it 'shows errs for all environments' do
             get :show, :id => @app.id
-            assigns(:problems).size.should == 21
+            controller.problems.size.should == 21
           end
         end
         context 'environment production' do
           it 'shows errs for just production' do
             get :show, :id => @app.id, :environment => 'production'
-            assigns(:problems).size.should == 6
+            controller.problems.size.should == 6
           end
         end
         context 'environment staging' do
           it 'shows errs for just staging' do
             get :show, :id => @app.id, :environment => 'staging'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment development' do
           it 'shows errs for just development' do
             get :show, :id => @app.id, :environment => 'development'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment test' do
           it 'shows errs for just test' do
             get :show, :id => @app.id, :environment => 'test'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
       end
@@ -149,7 +147,7 @@ describe AppsController do
         watcher = Fabricate(:user_watcher, :app => app, :user => user)
         sign_in user
         get :show, :id => app.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
       it 'does not find the app if the user is not watching it' do
@@ -170,19 +168,19 @@ describe AppsController do
     describe "GET /apps/new" do
       it 'instantiates a new app with a prebuilt watcher' do
         get :new
-        assigns(:app).should be_a(App)
-        assigns(:app).should be_new_record
-        assigns(:app).watchers.should_not be_empty
+        controller.app.should be_a(App)
+        controller.app.should be_new_record
+        controller.app.watchers.should_not be_empty
       end
       it "should copy attributes from an existing app" do
         @app = Fabricate(:app, :name => "do not copy",
                              :github_repo => "test/example")
         get :new, :copy_attributes_from => @app.id
-        assigns(:app).should be_a(App)
-        assigns(:app).should be_new_record
-        assigns(:app).name.should be_blank
-        assigns(:app).github_repo.should == "test/example"
+        controller.app.should be_a(App)
+        controller.app.should be_new_record
+        controller.app.name.should be_blank
+        controller.app.github_repo.should == "test/example"
       end
     end
@@ -190,7 +188,7 @@ describe AppsController do
       it 'finds the correct app' do
         app = Fabricate(:app)
         get :edit, :id => app.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
     end
@@ -326,12 +324,11 @@ describe AppsController do
     describe "DELETE /apps/:id" do
       before do
         @app = Fabricate(:app)
-        App.stub(:find).with(@app.id).and_return(@app)
       end
       it "should find the app" do
         delete :destroy, :id => @app.id
-        assigns(:app).should == @app
+        controller.app.should == @app
       end
       it "should destroy the app" do
@@ -12,7 +12,7 @@ describe ProblemsController do
   describe "GET /problems" do
-    render_views
+    #render_views
     context 'when logged in as an admin' do
       before(:each) do
         @user = Fabricate(:admin)
@@ -20,18 +20,6 @@ describe ProblemsController do
         @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production"))).problem
       end
-      it "should successfully list problems" do
-        get :index
-        response.should be_success
-        response.body.gsub("&#8203;", "").should match(@problem.message)
-      end
-
-      it "should list atom feed successfully" do
-        get :index, :format => "atom"
-        response.should be_success
-        response.body.should match(@problem.message)
-      end
-
       context "pagination" do
         before(:each) do
           35.times { Fabricate :err }
@@ -39,13 +27,13 @@ describe ProblemsController do
         it "should have default per_page value for user" do
           get :index
-          assigns(:problems).to_a.size.should == User::PER_PAGE
+          controller.problems.to_a.size.should == User::PER_PAGE
         end
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :index
-          assigns(:problems).to_a.size.should == 10
+          controller.problems.to_a.size.should == 10
         end
       end
@@ -60,35 +48,35 @@ describe ProblemsController do
         context 'no params' do
           it 'shows problems for all environments' do
             get :index
-            assigns(:problems).size.should == 21
+            controller.problems.size.should == 21
           end
         end
         context 'environment production' do
           it 'shows problems for just production' do
             get :index, :environment => 'production'
-            assigns(:problems).size.should == 6
+            controller.problems.size.should == 6
           end
         end
         context 'environment staging' do
           it 'shows problems for just staging' do
             get :index, :environment => 'staging'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment development' do
           it 'shows problems for just development' do
             get :index, :environment => 'development'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment test' do
           it 'shows problems for just test' do
             get :index, :environment => 'test'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
       end
@@ -101,8 +89,8 @@ describe ProblemsController do
         watched_unresolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false))
         watched_resolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true))
         get :index
-        assigns(:problems).should include(watched_unresolved_err.problem)
-        assigns(:problems).should_not include(unwatched_err.problem, watched_resolved_err.problem)
+        controller.problems.should include(watched_unresolved_err.problem)
+        controller.problems.should_not include(unwatched_err.problem, watched_resolved_err.problem)
       end
     end
   end
@@ -118,7 +106,7 @@ describe ProblemsController do
           mock('proxy', :page => mock('other_proxy', :per => problems))
         )
         get :index, :all_errs => true
-        assigns(:problems).should == problems
+        controller.problems.should == problems
       end
     end
@@ -129,14 +117,14 @@ describe ProblemsController do
         watched_unresolved_problem = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false)
         watched_resolved_problem = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true)
         get :index, :all_errs => true
-        assigns(:problems).should include(watched_resolved_problem, watched_unresolved_problem)
-        assigns(:problems).should_not include(unwatched_problem)
+        controller.problems.should include(watched_resolved_problem, watched_unresolved_problem)
+        controller.problems.should_not include(unwatched_problem)
       end
     end
   end
   describe "GET /apps/:app_id/problems/:id" do
-    render_views
+    #render_views
     context 'when logged in as an admin' do
       before do
@@ -145,12 +133,12 @@ describe ProblemsController do
       it "finds the app" do
         get :show, :app_id => app.id, :id => err.problem.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
       it "finds the problem" do
         get :show, :app_id => app.id, :id => err.problem.id
-        assigns(:problem).should == err.problem
+        controller.problem.should == err.problem
       end
       it "successfully render page" do
@@ -178,32 +166,6 @@ describe ProblemsController do
         end
       end
-      context "create issue button" do
-        let(:button_matcher) { match(/create issue/) }
-
-        it "should not exist for problem's app without issue tracker" do
-          err = Fabricate :err
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should_not button_matcher
-        end
-
-        it "should exist for problem's app with issue tracker" do
-          tracker = Fabricate(:lighthouse_tracker)
-          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app))
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should button_matcher
-        end
-
-        it "should not exist for problem with issue_link" do
-          tracker = Fabricate(:lighthouse_tracker)
-          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app, :issue_link => "http://some.host"))
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should_not button_matcher
-        end
-      end
     end
     context 'when logged in as a user' do
@@ -217,7 +179,7 @@ describe ProblemsController do
       it 'finds the problem if the user is watching the app' do
         get :show, :app_id => @watched_app.to_param, :id => @watched_err.problem.id
-        assigns(:problem).should == @watched_err.problem
+        controller.problem.should == @watched_err.problem
       end
       it 'raises a DocumentNotFound error if the user is not watching the app' do
@@ -242,8 +204,8 @@ describe ProblemsController do
       App.should_receive(:find).with(@problem.app.id).and_return(@problem.app)
       @problem.app.problems.should_receive(:find).and_return(@problem.problem)
       put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
-      assigns(:app).should == @problem.app
-      assigns(:problem).should == @problem.problem
+      controller.app.should == @problem.app
+      controller.problem.should == @problem.problem
     end
     it "should resolve the issue" do
@@ -269,7 +231,7 @@ describe ProblemsController do
   end
   describe "POST /apps/:app_id/problems/:id/create_issue" do
-    render_views
+    #render_views
     before(:each) do
       sign_in Fabricate(:admin)
@@ -379,31 +341,25 @@ describe ProblemsController do
       @problem2 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => false)).problem
     end
-    it "should apply to multiple problems" do
-      post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
-      assigns(:selected_problems).should == [@problem1, @problem2]
-    end
-
-    it "should require at least one problem" do
-      post :resolve_several, :problems => []
-      request.flash[:notice].should match(/You have not selected any/)
-    end
-
     context "POST /problems/merge_several" do
       it "should require at least two problems" do
         post :merge_several, :problems => [@problem1.id.to_s]
-        request.flash[:notice].should match(/You must select at least two/)
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.need_two_errors_merge')
       end
       it "should merge the problems" do
-        lambda {
-          post :merge_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
-          assigns(:merged_problem).reload.errs.length.should == 2
-        }.should change(Problem, :count).by(-1)
+        ProblemMerge.should_receive(:new).and_return(double(:merge => true))
+        post :merge_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
       end
     end
     context "POST /problems/unmerge_several" do
+
+      it "should require at least one problem" do
+        post :unmerge_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should unmerge a merged problem" do
         merged_problem = Problem.merge!(@problem1, @problem2)
         merged_problem.errs.length.should == 2
@@ -412,9 +368,16 @@ describe ProblemsController do
           merged_problem.reload.errs.length.should == 1
         }.should change(Problem, :count).by(1)
       end
+
     end
     context "POST /problems/resolve_several" do
+
+      it "should require at least one problem" do
+        post :resolve_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should resolve the issue" do
         post :resolve_several, :problems => [@problem2.id.to_s]
         @problem2.reload.resolved?.should == true
@@ -428,10 +391,17 @@ describe ProblemsController do
       it "should display a message about 2 errs" do
         post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
         flash[:success].should match(/2 errs have been resolved/)
+        controller.selected_problems.should == [@problem1, @problem2]
       end
     end
     context "POST /problems/unresolve_several" do
+
+      it "should require at least one problem" do
+        post :unresolve_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should unresolve the issue" do
         post :unresolve_several, :problems => [@problem1.id.to_s]
         @problem1.reload.resolved?.should == false
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-Fabrication::Config.fabricator_dir.each do |folder|
-  Dir.glob(File.join(Rails.root, folder, '**', '*.rb')).each do |file|
-    require file
-  end
-end
-
-describe "Fabrication" do
-  #TODO : when 1.8.7 drop support se directly Symbol#sort
-  Fabrication::Fabricator.schematics.keys.sort_by(&:to_s).each do |fabricator_name|
-    context "Fabricate(:#{fabricator_name})" do
-      subject { Fabricate.build(fabricator_name) }
-
-      it { should be_valid }
-    end
-  end
-end
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+Fabrication::Config.fabricator_dir.each do |folder|
+  Dir.glob(File.join(Rails.root, folder, '**', '*.rb')).each do |file|
+    require file
+  end
+end
+
+describe "Fabrication" do
+  #TODO : when 1.8.7 drop support se directly Symbol#sort
+  Fabrication::Fabricator.schematics.keys.sort_by(&:to_s).each do |fabricator_name|
+    context "Fabricate(:#{fabricator_name})" do
+      subject { Fabricate.build(fabricator_name) }
+
+      it { should be_valid }
+    end
+  end
+end
@@ -152,7 +152,6 @@ describe Problem do
     end
   end
-
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Problems' do
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe "apps/edit.html.haml" do
   before do
     app = stub_model(App)
-    assign :app, app
+    view.stub(:app).and_return(app)
     controller.stub(:current_user) { stub_model(User) }
   end
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe "apps/index.html.haml" do
   before do
     app = stub_model(App, :deploys => [stub_model(Deploy, :created_at => Time.now, :revision => "123456789abcdef")])
-    assign :apps, [app]
+    view.stub(:apps).and_return([app])
     controller.stub(:current_user) { stub_model(User) }
   end
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "problems/index.atom.builder" do
+
+  it 'display problem message' do
+    app = App.new(:new_record => false)
+    view.stub(:problems).and_return([Problem.new(
+      :message => 'foo',
+      :new_record => false, :app => app), Problem.new(:new_record => false, :app => app)])
+    render
+    rendered.should match('foo')
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "problems/index.html.haml" do
+  let(:problem_1) { Fabricate(:problem) }
+  let(:problem_2) { Fabricate(:problem, :app => problem_1.app) }
+
+  before do
+    # view.stub(:app).and_return(problem.app)
+    view.stub(:selected_problems).and_return([])
+    view.stub(:problems).and_return(Kaminari.paginate_array([problem_1, problem_2]).page(1).per(10))
+    view.stub(:params_sort).and_return('asc')
+    controller.stub(:current_user) { Fabricate(:user) }
+  end
+
+  describe "with problem" do
+    before { problem_1 && problem_2 }
+
+    it 'should works' do
+      render
+      rendered.should have_selector('div#problem_table.problem_table')
+    end
+  end
+
+end
+
 require 'spec_helper'
 describe "problems/show.html.haml" do
+  let(:problem) { Fabricate(:problem) }
+  let(:comment) { Fabricate(:comment) }
+
   before do
-    problem = Fabricate(:problem)
-    comment = Fabricate(:comment)
-    assign :problem, problem
+    view.stub(:app).and_return(problem.app)
+    view.stub(:problem).and_return(problem)
+
     assign :comment, comment
-    assign :app, problem.app
     assign :notices, problem.notices.page(1).per(1)
     assign :notice, problem.notices.first
+
     controller.stub(:current_user) { Fabricate(:user) }
   end
   def with_issue_tracker(tracker, problem)
     problem.app.issue_tracker = tracker.new :api_token => "token token token", :project_id => "1234"
-    assign :problem, problem
-    assign :app, problem.app
+    view.stub(:problem).and_return(problem)
+    view.stub(:app).and_return(problem.app)
   end
   describe "content_for :action_bar" do
@@ -54,8 +57,8 @@ describe &quot;problems/show.html.haml&quot; do
     it "should link 'up' to app_problems_path if HTTP_REFERER isn't set'" do
       controller.request.env['HTTP_REFERER'] = nil
       problem = Fabricate(:problem_with_comments)
-      assign :problem, problem
-      assign :app, problem.app
+      view.stub(:problem).and_return(problem)
+      view.stub(:app).and_return(problem.app)
       render
       action_bar.should have_selector("span a.up[href='#{app_problems_path(problem.app)}']", :text => 'up')
@@ -67,8 +70,8 @@ describe &quot;problems/show.html.haml&quot; do
         controller.stub(:current_user) { user }
         problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
-        assign :problem, problem
-        assign :app, problem.app
+        view.stub(:problem).and_return(problem)
+        view.stub(:app).and_return(problem.app)
         render
         action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
@@ -77,12 +80,54 @@ describe &quot;problems/show.html.haml&quot; do
       it 'should allow creating issue for github if application has a github tracker' do
         problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
         with_issue_tracker(GithubIssuesTracker, problem)
-        assign :problem, problem
-        assign :app, problem.app
+        view.stub(:problem).and_return(problem)
+        view.stub(:app).and_return(problem.app)
         render
         action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
       end
+
+      context "without issue tracker associate on app" do
+        let(:problem){ Problem.new(:new_record => false, :app => app) }
+        let(:app) { App.new(:new_record => false) }
+
+        it 'not see link to create issue' do
+          view.stub(:problem).and_return(problem)
+          view.stub(:app).and_return(problem.app)
+          render
+          expect(view.content_for(:action_bar)).to_not match(/create issue/)
+        end
+
+      end
+
+      context "with lighthouse tracker on app" do
+        let(:app) { App.new(:new_record => false, :issue_tracker => tracker ) }
+        let(:tracker) {
+          IssueTrackers::LighthouseTracker.new(:project_id => 'x')
+        }
+        context "with problem without issue link" do
+          let(:problem){ Problem.new(:new_record => false, :app => app) }
+          it 'not see link if no issue tracker' do
+            view.stub(:problem).and_return(problem)
+            view.stub(:app).and_return(problem.app)
+            render
+            expect(view.content_for(:action_bar)).to match(/create issue/)
+          end
+
+        end
+
+        context "with problem with issue link" do
+          let(:problem){ Problem.new(:new_record => false, :app => app, :issue_link => 'http://foo') }
+
+          it 'not see link if no issue tracker' do
+            view.stub(:problem).and_return(problem)
+            view.stub(:app).and_return(problem.app)
+            render
+            expect(view.content_for(:action_bar)).to_not match(/create issue/)
+          end
+        end
+
+      end
     end
   end
@@ -94,8 +139,8 @@ describe &quot;problems/show.html.haml&quot; do
     it 'should display comments and new comment form when no issue tracker' do
       problem = Fabricate(:problem_with_comments)
-      assign :problem, problem
-      assign :app, problem.app
+      view.stub(:problem).and_return(problem)
+      view.stub(:app).and_return(problem.app)
       render
       view.content_for(:comments).should include('Test comment')
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "problems/show.html.ics" do
+  let(:problem) { Fabricate(:problem) }
+  before do
+    view.stub(:problem).and_return(problem)
+  end
+
+  it 'should work' do
+    render :template => 'problems/show.ics.haml'
+  end
+
+
+end
	@@ -18,3 +18,4 @@ bin		@@ -18,3 +18,4 @@ bin
18	bundle	18	bundle
19	coverage	19	coverage
20	*#	20	*#
		21	+.ruby-version
	@@ -11,7 +11,6 @@ gem 'htmlentities'		@@ -11,7 +11,6 @@ gem 'htmlentities'
11	gem 'rack-ssl', :require => 'rack/ssl' # force SSL	11	gem 'rack-ssl', :require => 'rack/ssl' # force SSL
12		12
13	gem 'useragent'	13	gem 'useragent'
14	-gem 'inherited_resources'
15	gem 'decent_exposure'	14	gem 'decent_exposure'
16	gem 'strong_parameters'	15	gem 'strong_parameters'
17	gem 'SystemTimer', :platform => :ruby_18	16	gem 'SystemTimer', :platform => :ruby_18
	@@ -123,6 +123,7 @@ GEM		@@ -123,6 +123,7 @@ GEM
123	multipart-post (~> 1.1)	123	multipart-post (~> 1.1)
124	faraday_middleware (0.8.8)	124	faraday_middleware (0.8.8)
125	faraday (>= 0.7.4, < 0.9)	125	faraday (>= 0.7.4, < 0.9)
		126	+ ffi (1.9.0)
126	flowdock (0.3.1)	127	flowdock (0.3.1)
127	httparty (~> 0.7)	128	httparty (~> 0.7)
128	multi_json	129	multi_json
	@@ -133,7 +134,6 @@ GEM		@@ -133,7 +134,6 @@ GEM
133	tilt	134	tilt
134	happymapper (0.4.0)	135	happymapper (0.4.0)
135	libxml-ruby (~> 2.0)	136	libxml-ruby (~> 2.0)
136	- has_scope (0.5.1)
137	hashie (1.2.0)	137	hashie (1.2.0)
138	highline (1.6.19)	138	highline (1.6.19)
139	hike (1.2.3)	139	hike (1.2.3)
	@@ -151,9 +151,6 @@ GEM		@@ -151,9 +151,6 @@ GEM
151	multi_xml (>= 0.5.2)	151	multi_xml (>= 0.5.2)
152	httpauth (0.2.0)	152	httpauth (0.2.0)
153	i18n (0.6.1)	153	i18n (0.6.1)
154	- inherited_resources (1.4.0)
155	- has_scope (~> 0.5.0)
156	- responders (~> 0.9)
157	journey (1.0.4)	154	journey (1.0.4)
158	jquery-rails (2.1.4)	155	jquery-rails (2.1.4)
159	railties (>= 3.0, < 5.0)	156	railties (>= 3.0, < 5.0)
	@@ -288,8 +285,6 @@ GEM		@@ -288,8 +285,6 @@ GEM
288	rdoc (3.12.2)	285	rdoc (3.12.2)
289	json (~> 1.4)	286	json (~> 1.4)
290	ref (1.0.5)	287	ref (1.0.5)
291	- responders (0.9.3)
292	- railties (~> 3.1)
293	rest-client (1.6.7)	288	rest-client (1.6.7)
294	mime-types (>= 1.16)	289	mime-types (>= 1.16)
295	ri_cal (0.8.8)	290	ri_cal (0.8.8)
	@@ -412,7 +407,6 @@ DEPENDENCIES		@@ -412,7 +407,6 @@ DEPENDENCIES
412	hoptoad_notifier (~> 2.4)	407	hoptoad_notifier (~> 2.4)
413	htmlentities	408	htmlentities
414	httparty	409	httparty
415	- inherited_resources
416	jquery-rails (~> 2.1.4)	410	jquery-rails (~> 2.1.4)
417	kaminari (>= 0.14.1)	411	kaminari (>= 0.14.1)
418	launchy	412	launchy
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+# Include to do a Search
	2	+# TODO: Need to be in a Dedicated Object ProblemsSearch with params like input
	3	+#
	4	+module ProblemsSearcher
	5	+ extend ActiveSupport::Concern
	6	+
	7	+ included do
	8	+
	9	+ expose(:params_sort) {
	10	+ unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort])
	11	+ "last_notice_at"
	12	+ else
	13	+ params[:sort]
	14	+ end
	15	+ }
	16	+
	17	+ expose(:params_order){
	18	+ unless %w{asc desc}.member?(params[:order])
	19	+ 'desc'
	20	+ else
	21	+ params[:order]
	22	+ end
	23	+ }
	24	+
	25	+ expose(:selected_problems) {
	26	+ Array(Problem.find(err_ids))
	27	+ }
	28	+
	29	+ expose(:err_ids) {
	30	+ (params[:problems] \|\| []).compact
	31	+ }
	32	+
	33	+ end
	34	+end
	@@ -41,7 +41,7 @@ module AppsHelper		@@ -41,7 +41,7 @@ module AppsHelper
41	def detect_any_apps_with_attributes	41	def detect_any_apps_with_attributes
42	@any_github_repos = @any_issue_trackers = @any_deploys = @any_bitbucket_repos = @any_notification_services = false	42	@any_github_repos = @any_issue_trackers = @any_deploys = @any_bitbucket_repos = @any_notification_services = false
43		43
44	- @apps.each do \|app\|	44	+ apps.each do \|app\|
45	@any_github_repos \|\|= app.github_repo?	45	@any_github_repos \|\|= app.github_repo?
46	@any_bitbucket_repos \|\|= app.bitbucket_repo?	46	@any_bitbucket_repos \|\|= app.bitbucket_repo?
47	@any_issue_trackers \|\|= app.issue_tracker_configured?	47	@any_issue_trackers \|\|= app.issue_tracker_configured?
	@@ -40,4 +40,15 @@ class IssueTracker		@@ -40,4 +40,15 @@ class IssueTracker
40	def configured?	40	def configured?
41	project_id.present?	41	project_id.present?
42	end	42	end
		43	+
		44	+ ##
		45	+ # Update default_url_option with valid data from the request information
		46	+ #
		47	+ # @param [ Request ] a request with host, port and protocol
		48	+ #
		49	+ def self.update_url_options(request)
		50	+ IssueTracker.default_url_options[:host] = request.host
		51	+ IssueTracker.default_url_options[:port] = request.port
		52	+ IssueTracker.default_url_options[:protocol] = request.scheme
		53	+ end
43	end	54	end
1	-= errors_for @app	1	+= errors_for app
2		2
3	%div.required	3	%div.required
4	= f.label :name	4	= f.label :name
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	%th Last Deploy	16	%th Last Deploy
17	%th Errors	17	%th Errors
18	%tbody	18	%tbody
19	- - @apps.each do \|app\|	19	+ - apps.each do \|app\|
20	%tr	20	%tr
21	%td.name= link_to app.name, app_path(app)	21	%td.name= link_to app.name, app_path(app)
22	- if any_github_repos? or any_bitbucket_repos?	22	- if any_github_repos? or any_bitbucket_repos?
	@@ -50,7 +50,7 @@		@@ -50,7 +50,7 @@
50	- if app.problem_count > 0	50	- if app.problem_count > 0
51	- unresolved = app.unresolved_count	51	- unresolved = app.unresolved_count
52	= link_to unresolved, app_path(app), :class => (unresolved == 0 ? "resolved" : nil)	52	= link_to unresolved, app_path(app), :class => (unresolved == 0 ? "resolved" : nil)
53	- - if @apps.none?	53	+ - if apps.none?
54	%tr	54	%tr
55	%td{:colspan => 3}	55	%td{:colspan => 3}
56	%em	56	%em
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	= link_to_copy_attributes_from_other_app	3	= link_to_copy_attributes_from_other_app
4	= link_to('cancel', apps_path, :class => 'button')	4	= link_to('cancel', apps_path, :class => 'button')
5		5
6	-= form_for @app do \|f\|	6	+= form_for app do \|f\|
7		7
8	= render 'fields', :f => f	8	= render 'fields', :f => f
9		9
1	atom_feed do \|feed\|	1	atom_feed do \|feed\|
2	- feed.title("Errbit notices for #{h @app.name} at #{root_url}")	2	+ feed.title("Errbit notices for #{h app.name} at #{root_url}")
3	render "problems/list", :feed => feed	3	render "problems/list", :feed => feed
4	end	4	end