Merge branch 'master' of github:errbit/errbit

Brendon Rapp
2 parents 1eed79c8 fe1b7f5f
Showing 66 changed files with 1136 additions and 563 deletions Show diff stats
.gitignore
CHANGELOG.md
Gemfile
Gemfile.lock
README.md
app/assets/images/jira_active.png
app/assets/images/jira_create.png
app/assets/images/jira_goto.png
app/assets/images/jira_inactive.png
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/models/issue_trackers/bitbucket_issues_tracker.rb
app/models/issue_trackers/jira_tracker.rb
app/views/apps/_fields.html.haml
app/views/apps/edit.html.haml
@@ -18,3 +18,4 @@ bin
 bundle
 coverage
 *#
+.ruby-version
@@ -4,12 +4,17 @@
 - Update some gems ([@shingara][])
 - [#492][] Improve some Pjax call ([@nfedyashev][])
-- [#428][] Add the support of Unfuddle Tracker ([@parallel588][])
+- [#428][] Add the support of Unfuddle Issue Tracker ([@parallel588][])
 - Avoid to delete his own user ([@shingara][])
 - [#456][] Avoid to delete admin access of current user logged ([@shingara][])
 - [#253][] Refactor the Fingerprint generation ([@boblail][])
 - [#508][] Merge comments to when you merge problems ([@shingara][])
 - Update the Devise Gem to the last one ([@shingara][])
+- [#524][] Add current user information on the notifer.js ([@roryf][])
+- [#523][] Update javascript-stacktrace ([@aliscott][])
+- [#516][] Add Jira Issue tracker ([@xenji][])
+- [#512][] Add capabilities to configure the use of sendmail to send
+  email from Errbit ([@shingara][])
 ### Bug Fixes
@@ -76,24 +81,28 @@
 [#506]: https://github.com/errbit/errbit/issues/506
 [#508]: https://github.com/errbit/errbit/issues/508
 [#514]: https://github.com/errbit/errbit/issues/514
+[#516]: https://github.com/errbit/errbit/issues/516
 [#517]: https://github.com/errbit/errbit/issues/517
+[#524]: https://github.com/errbit/errbit/issues/524
 <!-- Contributor on Errbit Thanks to all of them -->
+[@Gonzih]: https://github.com/Gonzih
 [@SamSaffron]: https://github.com/SamSaffron
 [@adamjt]: https://github.com/adamjt
+[@aliscott]: http://github.com/aliscott
 [@alvarobp]: https://github.com/alvarobp
+[@boblail]: https://github.com/boblail
 [@chadcf]: https://github.com/chadcf
-[@mildavw]: https://github.com/mildavw
-[@sdepold]: https://github.com/sdepold
-[@shingara]: https://github.com/shingara
-[@tamaloa]: https://github.com/tamaloa
 [@ivanyv]: https://github.com/ivanyv
 [@manuelmeurer]: https://github.com/manuelmeurer
-[@tvdeyen]: https://github.com/tvdeyen
+[@mildavw]: https://github.com/mildavw
+[@mildavw]: https://github.com/mildavw
 [@nfedyashev]: https://github.com/nfedyashev
 [@parallel588]: https://github.com/parallel588
-[@Gonzih]: https://github.com/Gonzih
-[@boblail]: https://github.com/boblail
 [@roryf]: https://github.com/roryf
-[@mildavw]: https://github.com/mildavw
+[@sdepold]: https://github.com/sdepold
+[@shingara]: https://github.com/shingara
+[@tamaloa]: https://github.com/tamaloa
+[@tvdeyen]: https://github.com/tvdeyen
+[@xenji]: https://github.com/xenji
@@ -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
@@ -45,12 +44,15 @@ gem &#39;octokit&#39;
 gem 'gitlab', :git => 'https://github.com/NARKOZ/gitlab.git'
 # Bitbucket Issues
-gem 'bitbucket_rest_api'
+gem 'bitbucket_rest_api', :require => false
 # Unfuddle
 gem "taskmapper", "~> 0.8.0"
 gem "taskmapper-unfuddle", "~> 0.7.0"
+# Jira
+gem 'jira-ruby', :require => 'jira'
+
 # Notification services
 # ---------------------------------------
 # Campfire ( We can't upgrade to 1.0 because drop support of ruby 1.8
@@ -87,11 +89,9 @@ group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
   gem 'airbrake', :require => false
-  unless ENV["CI"]
-    gem 'ruby-debug', :platform => :mri_18
-    gem 'debugger', :platform => :mri_19
-    gem 'pry-rails'
-  end
+  gem 'ruby-debug', :platform => :mri_18
+  gem 'debugger', :platform => :mri_19
+  gem 'pry-rails'
 #  gem 'rpm_contrib'
 #  gem 'newrelic_rpm'
   gem 'quiet_assets'
@@ -118,7 +118,7 @@ group :test do
   # DatabaseCleaner 1.0.0 drop the support of ruby 1.8.7
   gem 'database_cleaner', '~> 0.9.0'
   gem 'email_spec'
-  gem 'timecop'
+  gem 'timecop', '0.6.1' # last version compatible to ruby 1.8
   gem 'coveralls', :require => false
 end
@@ -40,13 +40,13 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.4)
+    addressable (2.3.5)
     airbrake (3.1.12)
       activesupport
       builder
       json
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.1.1)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -66,7 +66,7 @@ GEM
     callsite (0.0.11)
     campy (0.1.3)
       multi_json (~> 1.0)
-    capistrano (2.15.4)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -90,19 +90,19 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    crack (0.4.0)
+    crack (0.4.1)
       safe_yaml (~> 0.9.0)
     css_parser (1.3.4)
       addressable
     daemons (1.1.9)
     database_cleaner (0.9.1)
     debug_inspector (0.0.2)
-    debugger (1.6.0)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
+      debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
+    debugger-ruby_core_source (1.2.3)
     decent_exposure (2.2.0)
     devise (2.2.4)
       bcrypt-ruby (~> 3.0)
@@ -111,7 +111,7 @@ GEM
       warden (~> 1.2.1)
     diff-lcs (1.2.4)
     dotenv (0.8.0)
-    email_spec (1.4.0)
+    email_spec (1.5.0)
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
@@ -119,10 +119,11 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     fabrication (1.3.2)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     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,10 @@ 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)
+    jira-ruby (0.1.2)
+      activesupport
+      oauth
+      railties
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
@@ -181,7 +182,7 @@ GEM
       callsite
       rack-contrib
       railties
-    method_source (0.8.1)
+    method_source (0.8.2)
     mime-types (1.23)
     mongo (1.8.6)
       bson (~> 1.8.6)
@@ -197,16 +198,17 @@ GEM
     multi_json (1.7.7)
     multi_xml (0.5.4)
     multipart-post (1.2.0)
-    net-scp (1.1.1)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     nokogiri (1.5.10)
     nokogiri-happymapper (0.5.7)
       nokogiri (~> 1.5)
+    oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
@@ -222,7 +224,7 @@ GEM
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    omniauth-github (1.1.0)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-oauth2 (1.1.1)
@@ -251,7 +253,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-rails (0.3.1)
+    pry-rails (0.3.2)
       pry (>= 0.9.10)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
@@ -288,22 +290,20 @@ 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)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rspec-mocks (2.14.2)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -315,7 +315,7 @@ GEM
     rushover (0.3.0)
       json
       rest-client
-    safe_yaml (0.9.3)
+    safe_yaml (0.9.5)
     selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
@@ -326,7 +326,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.5)
+    slop (3.4.6)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -360,18 +360,18 @@ GEM
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
     tzinfo (0.3.37)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    underscore-rails (1.4.4)
+    underscore-rails (1.5.1)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     useragent (0.6.0)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.12.0)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     websocket (1.0.7)
@@ -412,7 +412,7 @@ DEPENDENCIES
   hoptoad_notifier (~> 2.4)
   htmlentities
   httparty
-  inherited_resources
+  jira-ruby
   jquery-rails (~> 2.1.4)
   kaminari (>= 0.14.1)
   launchy
@@ -442,7 +442,7 @@ DEPENDENCIES
   taskmapper-unfuddle (~> 0.7.0)
   therubyracer
   thin
-  timecop
+  timecop (= 0.6.1)
   turbo-sprockets-rails3
   uglifier (>= 1.0.3)
   underscore-rails
@@ -423,6 +423,18 @@ card_type = Defect, status = Open, priority = Essential
 * Project id the id of your project where your ticket is create
 * Milestone id the id of your milestone where your ticket is create
+** Jira Issue Integration **
+
+* base_url the jira URL
+* context_path Context Path (Just "/" if empty otherwise with leading slash)
+* username HTTP Basic Auth User
+* password HTTP Basic Auth Password
+* project_id The project Key where the issue will be created
+* account Assign to this user. If empty, Jira takes the project default.
+* issue_component Website - Other
+* issue_type Issue type
+* issue_priority Priority
+
 What if Errbit has an error?
 ----------------------------
-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
@@ -17,6 +17,14 @@ class IssueTracker
   field :subdomain, :type => String
   field :milestone_id, :type => String
+  # Is there any better way to enhance the props? Putting them into the subclass leads to
+  # an error while rendering the form fields -.-
+  field :base_url, :type => String
+  field :context_path, :type => String
+  field :issue_type, :type => String
+  field :issue_component, :type => String
+  field :issue_priority, :type => String
+
   validate :check_params
   # Subclasses are responsible for overwriting this method.
@@ -40,4 +48,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
+require 'bitbucket_rest_api'
 class IssueTrackers::BitbucketIssuesTracker < IssueTracker
   Label = "bitbucket"
   Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'
@@ -0,0 +1,109 @@
+if defined? JIRA
+  class IssueTrackers::JiraTracker < IssueTracker
+    Label = 'jira'
+
+    Fields = [
+        [:base_url, {
+            :label => 'Jira URL without trailing slash',
+            :placeholder => 'https://jira.example.org/'
+        }],
+        [:context_path, {
+            :optional => true,
+            :label => 'Context Path (Just "/" if empty otherwise with leading slash)',
+            :placeholder => "/jira"
+        }],
+        [:username, {
+            :optional => true,
+            :label => 'HTTP Basic Auth User',
+            :placeholder => 'johndoe'
+        }],
+        [:password, {
+            :optional => true,
+            :label => 'HTTP Basic Auth Password',
+            :placeholder => 'p@assW0rd'
+        }],
+        [:project_id, {
+            :label => 'Project Key',
+            :placeholder => 'The project Key where the issue will be created'
+        }],
+        [:account, {
+            :optional => true,
+            :label => 'Assign to this user. If empty, Jira takes the project default.',
+            :placeholder => "username"
+        }],
+        [:issue_component, {
+            :label => 'Issue category',
+            :placeholder => 'Website - Other'
+        }],
+        [:issue_type, {
+            :label => 'Issue type',
+            :placeholder => 'Bug'
+        }],
+        [:issue_priority, {
+            :label => 'Priority',
+            :placeholder => 'Normal'
+        }]
+    ]
+
+    def check_params
+      if Fields.detect { |f| self[f[0]].blank? && !f[1][:optional] }
+        errors.add :base, 'You must specify all non optional values!'
+      end
+    end
+
+
+    #
+    # @param problem Problem
+    def create_issue(problem, reported_by = nil)
+      options = {
+          :username => username,
+          :password => password,
+          :site => base_url,
+          :context_path => context_path,
+          :auth_type => :basic
+      }
+      client = JIRA::Client.new(options)
+
+      issue = {
+          :fields => {
+              :project => {
+                  :key => project_id
+              },
+              :summary => issue_title(problem),
+              :description => body_template.result(binding),
+              :issuetype => {
+                  :name => issue_type
+              },
+              :priority => {
+                  :name => issue_priority,
+              },
+
+              :components => [{:name => issue_component}]
+          }
+      }
+
+      issue[:fields][:assignee] = {:name => account} if account
+
+      issue_build = client.Issue.build
+      issue_build.save(issue)
+      issue_build.fetch
+
+      problem.update_attributes(
+          :issue_link => "#{base_url}#{context_path}browse/#{issue_build.key}",
+          :issue_type => Label
+      )
+
+      # Maybe in a later version?
+      #remote_link = {
+      #    :url => app_problem_url(problem.app, problem),
+      #    :name => "Link to Errbit Issue"
+      #}
+      #remote_link_build = issue_build.remotelink.build
+      #remote_link_build.save(remote_link)
+    end
+
+    def body_template
+      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/jira_body.txt.erb"))
+    end
+  end
+end
 \ No newline at end of file
-= 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
@@ -0,0 +1,17 @@
+<% if notice = problem.notices.first %>
+h2. Summary
+<% if notice.request['url'].present? %>
+h3. URL
+
+"<%= notice.request['url'] %>":<%= notice.request['url'] %>
+<% end %>
+h3. Where
+
+<%= notice.where %>
+
+h3. When
+
+<%= notice.created_at.to_s(:micro) %>
+
+"More Details on Errbit":<%= app_problem_url problem.app, problem %>
+<% end %>
 \ No newline at end of file
-- 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))
@@ -102,3 +102,8 @@ github_access_scope: [&#39;repo&#39;]
 #  :user_name:            USERNAME
 #  :password:             PASSWORD
+
+# If you want send your email by your sendmail
+# sendmail_settings:
+#  :location: '/usr/sbin/sendmail'
+#  :arguments: '-i -t'
@@ -71,6 +71,11 @@ if smtp = Errbit::Config.smtp_settings
   ActionMailer::Base.smtp_settings = smtp
 end
+if sendmail = Errbit::Config.sendmail_settings
+  ActionMailer::Base.delivery_method = :sendmail
+  ActionMailer::Base.sendmail_settings = sendmail
+end
+
 # Set config specific values
 (ActionMailer::Base.default_url_options ||= {}).tap do |default|
   default.merge! :host => Errbit::Config.host if default[:host].blank?
@@ -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:
@@ -47,76 +47,112 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /**
- * Main function giving a function stack trace with a forced or passed in Error 
+ * Main function giving a function stack trace with a forced or passed in Error
  *
  * @cfg {Error} e The error to create a stacktrace from (optional)
  * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
- * @return {Array} of Strings with functions, lines, files, and arguments where possible 
+ * @return {Array} of Strings with functions, lines, files, and arguments where possible
  */
 function printStackTrace(options) {
-    var ex = (options && options.e) ? options.e : null;
-    var guess = options ? !!options.guess : true;
-    
-    var p = new printStackTrace.implementation();
-    var result = p.run(ex);
-    return (guess) ? p.guessFunctions(result) : result;
+    options = options || {guess: true};
+    var ex = options.e || null, guess = !!options.guess;
+    var p = new printStackTrace.implementation(), result = p.run(ex);
+    return (guess) ? p.guessAnonymousFunctions(result) : result;
+}
+
+if (typeof module !== "undefined" && module.exports) {
+    module.exports = printStackTrace;
 }
-printStackTrace.implementation = function() {};
+printStackTrace.implementation = function() {
+};
 printStackTrace.implementation.prototype = {
-    run: function(ex) {
-        ex = ex ||
-            (function() {
-                try {
-                    var _err = __undef__ << 1;
-                } catch (e) {
-                    return e;
-                }
-            })();
-        // Use either the stored mode, or resolve it
-        var mode = this._mode || this.mode(ex);
+    /**
+     * @param {Error} ex The error to create a stacktrace from (optional)
+     * @param {String} mode Forced mode (optional, mostly for unit tests)
+     */
+    run: function(ex, mode) {
+        ex = ex || this.createException();
+        // examine exception properties w/o debugger
+        //for (var prop in ex) {alert("Ex['" + prop + "']=" + ex[prop]);}
+        mode = mode || this.mode(ex);
         if (mode === 'other') {
             return this.other(arguments.callee);
         } else {
             return this[mode](ex);
         }
     },
-    
+
+    createException: function() {
+        try {
+            this.undef();
+        } catch (e) {
+            return e;
+        }
+    },
+
     /**
-     * @return {String} mode of operation for the environment in question.
+     * Mode could differ for different exception, e.g.
+     * exceptions in Chrome may or may not have arguments or stack.
+     *
+     * @return {String} mode of operation for the exception
      */
     mode: function(e) {
-        if (e['arguments']) {
-            return (this._mode = 'chrome');
-        } else if (window.opera && e.stacktrace) {
-            return (this._mode = 'opera10');
+        if (e['arguments'] && e.stack) {
+            return 'chrome';
+        } else if (e.stack && e.sourceURL) {
+            return 'safari';
+        } else if (e.stack && e.number) {
+            return 'ie';
+        } else if (typeof e.message === 'string' && typeof window !== 'undefined' && window.opera) {
+            // e.message.indexOf("Backtrace:") > -1 -> opera
+            // !e.stacktrace -> opera
+            if (!e.stacktrace) {
+                return 'opera9'; // use e.message
+            }
+            // 'opera#sourceloc' in e -> opera9, opera10a
+            if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
+                return 'opera9'; // use e.message
+            }
+            // e.stacktrace && !e.stack -> opera10a
+            if (!e.stack) {
+                return 'opera10a'; // use e.stacktrace
+            }
+            // e.stacktrace && e.stack -> opera10b
+            if (e.stacktrace.indexOf("called from line") < 0) {
+                return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
+            }
+            // e.stacktrace && e.stack -> opera11
+            return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
+        } else if (e.stack && !e.fileName) {
+            // Chrome 27 does not have e.arguments as earlier versions,
+            // but still does not have e.fileName as Firefox
+            return 'chrome';
         } else if (e.stack) {
-            return (this._mode = 'firefox');
-        } else if (window.opera && !('stacktrace' in e)) { //Opera 9-
-            return (this._mode = 'opera');
+            return 'firefox';
         }
-        return (this._mode = 'other');
+        return 'other';
     },
     /**
      * Given a context, function name, and callback function, overwrite it so that it calls
      * printStackTrace() first with a callback and then runs the rest of the body.
-     * 
+     *
      * @param {Object} context of execution (e.g. window)
      * @param {String} functionName to instrument
-     * @param {Function} function to call with a stack trace on invocation
+     * @param {Function} callback function to call with a stack trace on invocation
      */
     instrumentFunction: function(context, functionName, callback) {
         context = context || window;
-        context['_old' + functionName] = context[functionName];
-        context[functionName] = function() { 
-            callback.call(this, printStackTrace());
-            return context['_old' + functionName].apply(this, arguments);
+        var original = context[functionName];
+        context[functionName] = function instrumented() {
+            callback.call(this, printStackTrace().slice(4));
+            return context[functionName]._instrumented.apply(this, arguments);
         };
-        context[functionName]._instrumented = true;
+        context[functionName]._instrumented = original;
     },
-    
+
     /**
      * Given a context and function name of a function that has been
      * instrumented, revert the function to it's original (non-instrumented)
@@ -128,134 +164,207 @@ printStackTrace.implementation.prototype = {
     deinstrumentFunction: function(context, functionName) {
         if (context[functionName].constructor === Function &&
                 context[functionName]._instrumented &&
-                context['_old' + functionName].constructor === Function) {
-            context[functionName] = context['_old' + functionName];
+                context[functionName]._instrumented.constructor === Function) {
+            context[functionName] = context[functionName]._instrumented;
         }
     },
-    
+
     /**
      * Given an Error object, return a formatted Array based on Chrome's stack string.
-     * 
+     *
      * @param e - Error object to inspect
      * @return Array<String> of function calls, files and line numbers
      */
     chrome: function(e) {
-        return e.stack.replace(/^[^\(]+?[\n$]/gm, '').replace(/^\s+at\s+/gm, '').replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@').split('\n');
+        var stack = (e.stack + '\n').replace(/^\S[^\(]+?[\n$]/gm, '').
+          replace(/^\s+(at eval )?at\s+/gm, '').
+          replace(/^([^\(]+?)([\n$])/gm, '{anonymous}()@$1$2').
+          replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}()@$1').split('\n');
+        stack.pop();
+        return stack;
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Safari's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    safari: function(e) {
+        return e.stack.replace(/\[native code\]\n/m, '')
+            .replace(/^(?=\w+Error\:).*$\n/m, '')
+            .replace(/^@/gm, '{anonymous}()@')
+            .split('\n');
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on IE's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    ie: function(e) {
+        var lineRE = /^.*at (\w+) \(([^\)]+)\)$/gm;
+        return e.stack.replace(/at Anonymous function /gm, '{anonymous}()@')
+            .replace(/^(?=\w+Error\:).*$\n/m, '')
+            .replace(lineRE, '$1@$2')
+            .split('\n');
     },
     /**
      * Given an Error object, return a formatted Array based on Firefox's stack string.
-     * 
+     *
      * @param e - Error object to inspect
      * @return Array<String> of function calls, files and line numbers
      */
     firefox: function(e) {
-        return e.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^\(/gm, '{anonymous}(').split('\n');
+        return e.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^[\(@]/gm, '{anonymous}()@').split('\n');
+    },
+
+    opera11: function(e) {
+        var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var location = match[4] + ':' + match[1] + ':' + match[2];
+                var fnName = match[3] || "global code";
+                fnName = fnName.replace(/<anonymous function: (\S+)>/, "$1").replace(/<anonymous function>/, ANON);
+                result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+            }
+        }
+
+        return result;
+    },
+
+    opera10b: function(e) {
+        // "<anonymous function: run>([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
+        // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
+        // "@file://localhost/G:/js/test/functional/testcase1.html:15"
+        var lineRE = /^(.*)@(.+):(\d+)$/;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i++) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var fnName = match[1]? (match[1] + '()') : "global code";
+                result.push(fnName + '@' + match[2] + ':' + match[3]);
+            }
+        }
+
+        return result;
     },
     /**
      * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
-     * 
+     *
      * @param e - Error object to inspect
      * @return Array<String> of function calls, files and line numbers
      */
-    opera10: function(e) {
-        var stack = e.stacktrace;
-        var lines = stack.split('\n'), ANON = '{anonymous}',
-            lineRE = /.*line (\d+), column (\d+) in ((<anonymous function\:?\s*(\S+))|([^\(]+)\([^\)]*\))(?: in )?(.*)\s*$/i, i, j, len;
-        for (i = 2, j = 0, len = lines.length; i < len - 2; i++) {
-            if (lineRE.test(lines[i])) {
-                var location = RegExp.$6 + ':' + RegExp.$1 + ':' + RegExp.$2;
-                var fnName = RegExp.$3;
-                fnName = fnName.replace(/<anonymous function\:?\s?(\S+)?>/g, ANON);
-                lines[j++] = fnName + '@' + location;
+    opera10a: function(e) {
+        // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
+        // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
+        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var fnName = match[3] || ANON;
+                result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
             }
         }
-        
-        lines.splice(j, lines.length - j);
-        return lines;
+
+        return result;
     },
-    
-    // Opera 7.x-9.x only!
-    opera: function(e) {
-        var lines = e.message.split('\n'), ANON = '{anonymous}', 
-            lineRE = /Line\s+(\d+).*script\s+(http\S+)(?:.*in\s+function\s+(\S+))?/i, 
-            i, j, len;
-        
-        for (i = 4, j = 0, len = lines.length; i < len; i += 2) {
-            //TODO: RegExp.exec() would probably be cleaner here
-            if (lineRE.test(lines[i])) {
-                lines[j++] = (RegExp.$3 ? RegExp.$3 + '()@' + RegExp.$2 + RegExp.$1 : ANON + '()@' + RegExp.$2 + ':' + RegExp.$1) + ' -- ' + lines[i + 1].replace(/^\s+/, '');
+
+    // Opera 7.x-9.2x only!
+    opera9: function(e) {
+        // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
+        // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
+        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
+        var lines = e.message.split('\n'), result = [];
+
+        for (var i = 2, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
             }
         }
-        
-        lines.splice(j, lines.length - j);
-        return lines;
+
+        return result;
     },
-    
-    // Safari, IE, and others
+
+    // Safari 5-, IE 9-, and others
     other: function(curr) {
-        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i,
-            stack = [], fn, args, maxStackSize = 10;
-        
-        while (curr && stack.length < maxStackSize) {
+        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], fn, args, maxStackSize = 10;
+        while (curr && curr['arguments'] && stack.length < maxStackSize) {
             fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
-            args = Array.prototype.slice.call(curr['arguments']);
+            args = Array.prototype.slice.call(curr['arguments'] || []);
             stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
             curr = curr.caller;
         }
         return stack;
     },
-    
+
     /**
-     * Given arguments array as a String, subsituting type names for non-string types.
+     * Given arguments array as a String, substituting type names for non-string types.
      *
-     * @param {Arguments} object
-     * @return {Array} of Strings with stringified arguments
+     * @param {Arguments,Array} args
+     * @return {String} stringified arguments
      */
     stringifyArguments: function(args) {
+        var result = [];
+        var slice = Array.prototype.slice;
         for (var i = 0; i < args.length; ++i) {
             var arg = args[i];
             if (arg === undefined) {
-                args[i] = 'undefined';
+                result[i] = 'undefined';
             } else if (arg === null) {
-                args[i] = 'null';
+                result[i] = 'null';
             } else if (arg.constructor) {
                 if (arg.constructor === Array) {
                     if (arg.length < 3) {
-                        args[i] = '[' + this.stringifyArguments(arg) + ']';
+                        result[i] = '[' + this.stringifyArguments(arg) + ']';
                     } else {
-                        args[i] = '[' + this.stringifyArguments(Array.prototype.slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(Array.prototype.slice.call(arg, -1)) + ']';
+                        result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
                     }
                 } else if (arg.constructor === Object) {
-                    args[i] = '#object';
+                    result[i] = '#object';
                 } else if (arg.constructor === Function) {
-                    args[i] = '#function';
+                    result[i] = '#function';
                 } else if (arg.constructor === String) {
-                    args[i] = '"' + arg + '"';
+                    result[i] = '"' + arg + '"';
+                } else if (arg.constructor === Number) {
+                    result[i] = arg;
                 }
             }
         }
-        return args.join(',');
+        return result.join(',');
     },
-    
+
     sourceCache: {},
-    
+
     /**
-     * @return the text from a given URL.
+     * @return the text from a given URL
      */
     ajax: function(url) {
         var req = this.createXMLHTTPObject();
-        if (!req) {
-            return;
+        if (req) {
+            try {
+                req.open('GET', url, false);
+                //req.overrideMimeType('text/plain');
+                //req.overrideMimeType('text/javascript');
+                req.send(null);
+                //return req.status == 200 ? req.responseText : '';
+                return req.responseText;
+            } catch (e) {
+            }
         }
-        req.open('GET', url, false);
-        // REMOVED FOR JS TEST. 
-		//req.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
-        req.send('');
-        return req.responseText;
+        return '';
     },
-    
+
     /**
      * Try XHR methods in order and store XHR factory.
      *
@@ -279,7 +388,8 @@ printStackTrace.implementation.prototype = {
                 // Use memoization to cache the factory
                 this.createXMLHTTPObject = XMLHttpFactories[i];
                 return xmlhttp;
-            } catch (e) {}
+            } catch (e) {
+            }
         }
     },
@@ -288,12 +398,12 @@ printStackTrace.implementation.prototype = {
      * via Ajax).
      *
      * @param url <String> source url
-     * @return False if we need a cross-domain request
+     * @return <Boolean> False if we need a cross-domain request
      */
     isSameDomain: function(url) {
-        return url.indexOf(location.hostname) !== -1;
+        return typeof location !== "undefined" && url.indexOf(location.hostname) !== -1; // location may not be defined, e.g. when running from nodejs.
     },
-    
+
     /**
      * Get source code from given URL if in the same domain.
      *
@@ -301,52 +411,78 @@ printStackTrace.implementation.prototype = {
      * @return <Array> Array of source code lines
      */
     getSource: function(url) {
+        // TODO reuse source from script tags?
         if (!(url in this.sourceCache)) {
             this.sourceCache[url] = this.ajax(url).split('\n');
         }
         return this.sourceCache[url];
     },
-    
-    guessFunctions: function(stack) {
+
+    guessAnonymousFunctions: function(stack) {
         for (var i = 0; i < stack.length; ++i) {
-            var reStack = /\{anonymous\}\(.*\)@(\w+:\/\/([\-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/;
-            var frame = stack[i], m = reStack.exec(frame);
-            if (m) {
-                var file = m[1], lineno = m[4]; //m[7] is character position in Chrome
-                if (file && this.isSameDomain(file) && lineno) {
-                    var functionName = this.guessFunctionName(file, lineno);
-                    stack[i] = frame.replace('{anonymous}', functionName);
+            var reStack = /\{anonymous\}\(.*\)@(.*)/,
+                reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
+                frame = stack[i], ref = reStack.exec(frame);
+
+            if (ref) {
+                var m = reRef.exec(ref[1]);
+                if (m) { // If falsey, we did not get any file/line information
+                    var file = m[1], lineno = m[2], charno = m[3] || 0;
+                    if (file && this.isSameDomain(file) && lineno) {
+                        var functionName = this.guessAnonymousFunction(file, lineno, charno);
+                        stack[i] = frame.replace('{anonymous}', functionName);
+                    }
                 }
             }
         }
         return stack;
     },
-    
-    guessFunctionName: function(url, lineNo) {
+
+    guessAnonymousFunction: function(url, lineNo, charNo) {
+        var ret;
         try {
-            return this.guessFunctionNameFromLines(lineNo, this.getSource(url));
+            ret = this.findFunctionName(this.getSource(url), lineNo);
         } catch (e) {
-            return 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+            ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
         }
+        return ret;
     },
-    
-    guessFunctionNameFromLines: function(lineNo, source) {
-        var reFunctionArgNames = /function ([^(]*)\(([^)]*)\)/;
-        var reGuessFunction = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/;
-        // Walk backwards from the first line in the function until we find the line which
-        // matches the pattern above, which is the function definition
-        var line = "", maxLines = 10;
+
+    findFunctionName: function(source, lineNo) {
+        // FIXME findFunctionName fails for compressed source
+        // (more than one function on the same line)
+        // function {name}({args}) m[1]=name m[2]=args
+        var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
+        // {name} = function ({args}) TODO args capture
+        // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
+        var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
+        // {name} = eval()
+        var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
+        // Walk backwards in the source lines until we find
+        // the line which matches one of the patterns above
+        var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
         for (var i = 0; i < maxLines; ++i) {
-            line = source[lineNo - i] + line;
-            if (line !== undefined) {
-                var m = reGuessFunction.exec(line);
+            // lineNo is 1-based, source[] is 0-based
+            line = source[lineNo - i - 1];
+            commentPos = line.indexOf('//');
+            if (commentPos >= 0) {
+                line = line.substr(0, commentPos);
+            }
+            // TODO check other types of comments? Commented code may lead to false positive
+            if (line) {
+                code = line + code;
+                m = reFunctionExpression.exec(code);
+                if (m && m[1]) {
+                    return m[1];
+                }
+                m = reFunctionDeclaration.exec(code);
+                if (m && m[1]) {
+                    //return m[1] + "(" + (m[2] || "") + ")";
+                    return m[1];
+                }
+                m = reFunctionEvaluation.exec(code);
                 if (m && m[1]) {
                     return m[1];
-                } else {
-                    m = reFunctionArgNames.exec(line);
-                    if (m && m[1]) {
-                        return m[1];
-                    }
                 }
             }
         }
@@ -379,6 +515,11 @@ printStackTrace.implementation.prototype = {
                 '<project-root>{project_root}</project-root>' +
                 '<environment-name>{environment}</environment-name>' +
             '</server-environment>' +
+            '<current-user>' +
+                '<id>{user_id}</id>' +
+                '<name>{user_name}</name>' +
+                '<email>{user_email}</email>' +
+            '</current-user>' +
         '</notice>',
         REQUEST_VARIABLE_GROUP_XML = '<{group_name}>{inner_content}</{group_name}>',
         REQUEST_VARIABLE_XML = '<var key="{key}">{value}</var>',
@@ -411,9 +552,9 @@ printStackTrace.implementation.prototype = {
                 "rootDirectory": "{project_root}",
                 "action": "{request_action}",
-				"userId": "{}",
-				"userName": "{}",
-				"userEmail": "{}",
+				"userId": "{user_id}",
+				"userName": "{user_name}",
+				"userEmail": "{user_email}",
             },
             "environment": {},
 			//"session": "",
@@ -683,6 +824,15 @@ printStackTrace.implementation.prototype = {
             variable: 'outputFormat',
             namespace: 'options'
         }, {
+            methodName: 'setCurrentUser',
+            method: (function (value) {
+                for (var key in value) {
+                    if (value.hasOwnProperty(key)) {
+                        Config.xmlData['user_' + key] = value[key];
+                    }
+                }
+            })
+        }, {
             methodName: 'setTrackJQ',
             variable: 'trackJQ',
             namespace: 'options',
@@ -17,7 +17,7 @@ describe Api::V1::NoticesController do
       it "should return JSON if JSON is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "json"
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError)
       end
       it "should return XML if XML is requested" do
@@ -27,7 +27,7 @@ describe Api::V1::NoticesController do
       it "should return JSON by default" do
         get :index, :auth_token => @user.authentication_token
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError)
       end
       describe "given a date range" do
@@ -19,7 +19,7 @@ describe Api::V1::ProblemsController do
       it "should return JSON if JSON is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "json"
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
       end
       it "should return XML if XML is requested" do
@@ -29,7 +29,7 @@ describe Api::V1::ProblemsController do
       it "should return JSON by default" do
         get :index, :auth_token => @user.authentication_token
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
       end
 require 'spec_helper'
 describe AppsController do
-  render_views
   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 +24,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 +41,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
@@ -55,7 +52,6 @@ describe AppsController do
       it "should list atom feed successfully" do
         get :show, :id => @app.id, :format => "atom"
         response.should be_success
-        response.body.should match(@problem.message)
       end
       context "pagination" do
@@ -65,13 +61,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 +81,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 +104,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 +145,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 +166,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 +186,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
@@ -316,7 +312,6 @@ describe AppsController do
               @app.reload
               @app.issue_tracker_configured?.should == false
-              response.body.should match(/You must specify your/)
             end
           end
         end
@@ -326,12 +321,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
@@ -6,7 +6,7 @@ describe NoticesController do
   let(:notice) { Fabricate(:notice) }
   let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
   let(:app) { Fabricate(:app) }
-  let(:error_report) { mock(:valid? => true, :generate_notice! => true, :notice => notice) }
+  let(:error_report) { double(:valid? => true, :generate_notice! => true, :notice => notice) }
   context 'notices API' do
     context "with all params" do
@@ -46,7 +46,7 @@ describe NoticesController do
         response.body.should match(%r{<url[^>]*>(.+)#{locate_path(notice.id)}</url>})
       end
       context "with an invalid API_KEY" do
-        let(:error_report) { mock(:valid? => false) }
+        let(:error_report) { double(:valid? => false) }
         it 'return 422' do
           post :create, :format => :xml, :data => xml
           expect(response.status).to eq 422
@@ -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
@@ -115,10 +103,10 @@ describe ProblemsController do
         3.times { problems << Fabricate(:err).problem }
         3.times { problems << Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem }
         Problem.should_receive(:ordered_by).and_return(
-          mock('proxy', :page => mock('other_proxy', :per => problems))
+          double('proxy', :page => double('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
@@ -12,7 +12,7 @@ describe Users::OmniauthCallbacksController do
         :credentials => { :token => token }
       )
     }
-    @controller.stub!(:env).and_return(env)
+    @controller.stub(:env).and_return(env)
   end
   context 'Linking a GitHub account to a signed in user' do
@@ -207,7 +207,7 @@ describe UsersController do
     context "DELETE /users/:id" do
       context "with a destroy success" do
-        let(:user_destroy) { mock(:destroy => true) }
+        let(:user_destroy) { double(:destroy => true) }
         before {
           UserDestroy.should_receive(:new).with(user).and_return(user_destroy)
@@ -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
@@ -8,8 +8,8 @@ describe ProblemDestroy do
   context "in unit way" do
     let(:problem) {
       problem = Problem.new
-      problem.stub(:errs).and_return(mock(:criteria, :only => [err_1, err_2]))
-      problem.stub(:comments).and_return(mock(:criteria, :only => [comment_1, comment_2]))
+      problem.stub(:errs).and_return(double(:criteria, :only => [err_1, err_2]))
+      problem.stub(:comments).and_return(double(:criteria, :only => [comment_1, comment_2]))
       problem.stub(:delete)
       problem
     }
@@ -42,7 +42,7 @@ describe ProblemMerge do
     end
     it 'update problem cache' do
-      ProblemUpdaterCache.should_receive(:new).with(problem).and_return(mock(:update => true))
+      ProblemUpdaterCache.should_receive(:new).with(problem).and_return(double(:update => true))
       problem_merge.merge
     end
@@ -22,8 +22,8 @@ describe Backtrace do
   describe "find_or_create" do
     subject { described_class.find_or_create(attributes) }
-    let(:attributes) { mock :attributes }
-    let(:backtrace) { mock :backtrace }
+    let(:attributes) { double :attributes }
+    let(:backtrace) { double :backtrace }
     before { described_class.stub(:new => backtrace) }
@@ -37,7 +37,7 @@ describe Backtrace do
     end
     context "similar backtrace exist" do
-      let(:similar_backtrace) { mock :similar_backtrace }
+      let(:similar_backtrace) { double :similar_backtrace }
       before { backtrace.stub(:similar => similar_backtrace) }
       it { should == similar_backtrace }
@@ -10,7 +10,7 @@ describe CommentObserver do
       it 'should send an email notification' do
         Mailer.should_receive(:comment_notification).
           with(comment).
-          and_return(mock('email', :deliver => true))
+          and_return(double('email', :deliver => true))
         comment.save
       end
     end
@@ -5,7 +5,7 @@ describe DeployObserver do
     context 'and the app should notify on deploys' do
       it 'should send an email notification' do
         Mailer.should_receive(:deploy_notification).
-          and_return(mock('email', :deliver => true))
+          and_return(double('email', :deliver => true))
         Fabricate(:deploy, :app => Fabricate(:app_with_watcher, :notify_on_deploys => true))
       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
@@ -9,7 +9,7 @@ describe IssueTrackers::FogbugzTracker do
     number = 123
     @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}"
     response = "<response><token>12345</token><case><ixBug>123</ixBug></case></response>"
-    http_mock = mock
+    http_mock = double
     http_mock.should_receive(:new).and_return(http_mock)
     http_mock.should_receive(:request).twice.and_return(response)
     Fogbugz.adapter[:http] = http_mock
@@ -18,7 +18,7 @@ describe NoticeObserver do
       it "sends an email notification after #{threshold} notice(s)" do
         @err.problem.stub(:notices_count).and_return(threshold)
         Mailer.should_receive(:err_notification).
-          and_return(mock('email', :deliver => true))
+          and_return(double('email', :deliver => true))
         Fabricate(:notice, :err => @err)
       end
     end
@@ -38,7 +38,7 @@ describe NoticeObserver do
     it "should send email notification after 1 notice since an error has been resolved" do
       @err.problem.resolve!
       Mailer.should_receive(:err_notification).
-        and_return(mock('email', :deliver => true))
+        and_return(double('email', :deliver => true))
       Fabricate(:notice, :err => @err)
     end
   end
@@ -103,7 +103,7 @@ describe NoticeObserver do
       Fabricate(:notice, :err => err)
     end
   end
-  
+
   describe "should send a notification at desired intervals" do
     let(:app) { Fabricate(:app, :email_at_notices => [1], :notification_service => Fabricate(:campfire_notification_service, :notify_at_notices => [1,2]))}
     let(:backtrace) { Fabricate(:backtrace) }
@@ -8,7 +8,7 @@ describe NotificationService::CampfireService do
     problem = notice.problem
     #campy stubbing
-    campy = mock('CampfireService')
+    campy = double('CampfireService')
     Campy::Room.stub(:new).and_return(campy)
     campy.stub(:speak) { true }
@@ -9,7 +9,7 @@ describe NotificationService::GtalkService do
     problem = notice.problem
     #gtalk stubbing
-    gtalk = mock('GtalkService')
+    gtalk = double('GtalkService')
     jid = double("jid")
     message = double("message")
     Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
@@ -19,13 +19,13 @@ describe NotificationService::GtalkService do
     message_value = """#{problem.app.name.to_s}
 http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
-    
+
     Jabber::Message.should_receive(:new).with(notification_service.user_id, message_value).and_return(message)
     Jabber::Message.should_receive(:new).with(notification_service.room_id, message_value).and_return(message)
-    
+
     Jabber::MUC::SimpleMUCClient.should_receive(:new).and_return(gtalk)
     gtalk.should_receive(:join).with(notification_service.room_id + "/errbit")
-    
+
     #assert
     gtalk.should_receive(:send).exactly(2).times.with(message)
@@ -43,7 +43,7 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
 #{@notification_service.notification_description @problem}"""
       # gtalk stubbing
-      @gtalk = mock('GtalkService')
+      @gtalk = double('GtalkService')
       @gtalk.should_receive(:connect)
       @gtalk.should_receive(:auth)
       jid = double("jid")
@@ -86,7 +86,7 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
       @notification_service.room_id = ""
       @notification_service.create_notification(@problem)
     end
-    
+
   end
   it "it should send a notification to room only" do
@@ -97,7 +97,7 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
     problem = notice.problem
     #gtalk stubbing
-    gtalk = mock('GtalkService')
+    gtalk = double('GtalkService')
     jid = double("jid")
     message = double("message")
     Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
@@ -107,11 +107,11 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
     message_value = """#{problem.app.name.to_s}
 http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
-    
+
     Jabber::Message.should_receive(:new).with(notification_service.room_id, message_value).and_return(message)
-    
+
     Jabber::MUC::SimpleMUCClient.should_receive(:new).and_return(gtalk)
-    gtalk.should_receive(:join).with(notification_service.room_id + "/errbit")    
+    gtalk.should_receive(:join).with(notification_service.room_id + "/errbit")
     notification_service.user_id = ""
@@ -8,7 +8,7 @@ describe NotificationService::HoiioService do
     problem = notice.problem
     # hoi stubbing
-    sms = mock('HoiioService')
+    sms = double('HoiioService')
     Hoi::SMS.stub(:new).and_return(sms)
     sms.stub(:send) { true }
@@ -8,7 +8,7 @@ describe NotificationService::PushoverService do
     problem = notice.problem
     # hoi stubbing
-    notification = mock('PushoverService')
+    notification = double('PushoverService')
     Rushover::Client.stub(:new).and_return(notification)
     notification.stub(:notify) { true }
@@ -123,12 +123,12 @@ describe Problem do
     it "should throw an err if it's not successful" do
       problem = Fabricate(:problem)
       problem.should_not be_resolved
-      problem.stub!(:valid?).and_return(false)
+      problem.stub(:valid?).and_return(false)
       ## update_attributes not test #valid? but #errors.any?
       # https://github.com/mongoid/mongoid/blob/master/lib/mongoid/persistence.rb#L137
       er = ActiveModel::Errors.new(problem)
       er.add_on_blank(:resolved)
-      problem.stub!(:errors).and_return(er)
+      problem.stub(:errors).and_return(er)
       problem.should_not be_valid
       lambda {
         problem.resolve!
@@ -152,7 +152,6 @@ describe Problem do
     end
   end
-
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Problems' do
 require 'spec_helper'
 describe "apps/edit.html.haml" do
+  let(:app) { stub_model(App) }
   before do
-    app = stub_model(App)
-    assign :app, app
+    view.stub(:app).and_return(app)
     controller.stub(:current_user) { stub_model(User) }
   end
@@ -19,5 +19,19 @@ describe &quot;apps/edit.html.haml&quot; do
     end
   end
+
+  context "with unvalid app" do
+    let(:app) {
+      app = stub_model(App)
+      app.errors.add(:base,'You must specify your')
+      app
+    }
+
+    it 'see the error' do
+      render
+      rendered.should match(/You must specify your/)
+    end
+  end
+
 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,37 @@
+require 'spec_helper'
+
+describe "apps/new.html.haml" do
+  let(:app) { stub_model(App) }
+  before do
+    view.stub(:app).and_return(app)
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'cancel' link" do
+      render
+
+      action_bar.should have_selector('a.button', :text => 'cancel')
+    end
+
+  end
+
+  context "with unvalid app" do
+    let(:app) {
+      app = stub_model(App)
+      app.errors.add(:base,'You must specify your')
+      app
+    }
+
+    it 'see the error' do
+      render
+      rendered.should match(/You must specify your/)
+    end
+  end
+
+end
+
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "apps/show.atom.builder" do
+  let(:app) { stub_model(App) }
+  let(:problems) { [
+    stub_model(Problem, :message => 'foo', :app => app)
+  ]}
+
+  before do
+    view.stub(:app).and_return(app)
+    view.stub(:problems).and_return(problems)
+  end
+
+  context "with errs" do
+    it 'see the errs message' do
+      render
+      expect(rendered).to match(problems.first.message)
+    end
+  end
+
+end
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "apps/show.html.haml" do
+  let(:app) { stub_model(App) }
+  before do
+    view.stub(:app).and_return(app)
+    view.stub(:all_errs).and_return(false)
+    view.stub(:deploys).and_return([])
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'cancel' link" do
+      render
+
+      action_bar.should have_selector('a.button', :text => 'all errs')
+    end
+
+  end
+
+  context "without errs" do
+    it 'see no errs' do
+      render
+      rendered.should match(/No errs have been/)
+    end
+  end
+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', :formats => [:ics], :handlers => [: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
	@@ -40,13 +40,13 @@ GEM		@@ -40,13 +40,13 @@ GEM
40	activesupport (3.2.13)	40	activesupport (3.2.13)
41	i18n (= 0.6.1)	41	i18n (= 0.6.1)
42	multi_json (~> 1.0)	42	multi_json (~> 1.0)
43	- addressable (2.3.4)	43	+ addressable (2.3.5)
44	airbrake (3.1.12)	44	airbrake (3.1.12)
45	activesupport	45	activesupport
46	builder	46	builder
47	json	47	json
48	arel (3.0.2)	48	arel (3.0.2)
49	- bcrypt-ruby (3.0.1)	49	+ bcrypt-ruby (3.1.1)
50	better_errors (0.9.0)	50	better_errors (0.9.0)
51	coderay (>= 1.0.0)	51	coderay (>= 1.0.0)
52	erubis (>= 2.6.6)	52	erubis (>= 2.6.6)
	@@ -66,7 +66,7 @@ GEM		@@ -66,7 +66,7 @@ GEM
66	callsite (0.0.11)	66	callsite (0.0.11)
67	campy (0.1.3)	67	campy (0.1.3)
68	multi_json (~> 1.0)	68	multi_json (~> 1.0)
69	- capistrano (2.15.4)	69	+ capistrano (2.15.5)
70	highline	70	highline
71	net-scp (>= 1.0.0)	71	net-scp (>= 1.0.0)
72	net-sftp (>= 2.0.0)	72	net-sftp (>= 2.0.0)
	@@ -90,19 +90,19 @@ GEM		@@ -90,19 +90,19 @@ GEM
90	rest-client	90	rest-client
91	simplecov (>= 0.7)	91	simplecov (>= 0.7)
92	thor	92	thor
93	- crack (0.4.0)	93	+ crack (0.4.1)
94	safe_yaml (~> 0.9.0)	94	safe_yaml (~> 0.9.0)
95	css_parser (1.3.4)	95	css_parser (1.3.4)
96	addressable	96	addressable
97	daemons (1.1.9)	97	daemons (1.1.9)
98	database_cleaner (0.9.1)	98	database_cleaner (0.9.1)
99	debug_inspector (0.0.2)	99	debug_inspector (0.0.2)
100	- debugger (1.6.0)	100	+ debugger (1.6.1)
101	columnize (>= 0.3.1)	101	columnize (>= 0.3.1)
102	debugger-linecache (~> 1.2.0)	102	debugger-linecache (~> 1.2.0)
103	- debugger-ruby_core_source (~> 1.2.1)	103	+ debugger-ruby_core_source (~> 1.2.3)
104	debugger-linecache (1.2.0)	104	debugger-linecache (1.2.0)
105	- debugger-ruby_core_source (1.2.2)	105	+ debugger-ruby_core_source (1.2.3)
106	decent_exposure (2.2.0)	106	decent_exposure (2.2.0)
107	devise (2.2.4)	107	devise (2.2.4)
108	bcrypt-ruby (~> 3.0)	108	bcrypt-ruby (~> 3.0)
	@@ -111,7 +111,7 @@ GEM		@@ -111,7 +111,7 @@ GEM
111	warden (~> 1.2.1)	111	warden (~> 1.2.1)
112	diff-lcs (1.2.4)	112	diff-lcs (1.2.4)
113	dotenv (0.8.0)	113	dotenv (0.8.0)
114	- email_spec (1.4.0)	114	+ email_spec (1.5.0)
115	launchy (~> 2.1)	115	launchy (~> 2.1)
116	mail (~> 2.2)	116	mail (~> 2.2)
117	erubis (2.7.0)	117	erubis (2.7.0)
	@@ -119,10 +119,11 @@ GEM		@@ -119,10 +119,11 @@ GEM
119	execjs (1.4.0)	119	execjs (1.4.0)
120	multi_json (~> 1.0)	120	multi_json (~> 1.0)
121	fabrication (1.3.2)	121	fabrication (1.3.2)
122	- faraday (0.8.7)
123	- multipart-post (~> 1.1)	122	+ faraday (0.8.8)
		123	+ multipart-post (~> 1.2.0)
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,10 @@ GEM		@@ -151,9 +151,10 @@ 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)	154	+ jira-ruby (0.1.2)
		155	+ activesupport
		156	+ oauth
		157	+ railties
157	journey (1.0.4)	158	journey (1.0.4)
158	jquery-rails (2.1.4)	159	jquery-rails (2.1.4)
159	railties (>= 3.0, < 5.0)	160	railties (>= 3.0, < 5.0)
	@@ -181,7 +182,7 @@ GEM		@@ -181,7 +182,7 @@ GEM
181	callsite	182	callsite
182	rack-contrib	183	rack-contrib
183	railties	184	railties
184	- method_source (0.8.1)	185	+ method_source (0.8.2)
185	mime-types (1.23)	186	mime-types (1.23)
186	mongo (1.8.6)	187	mongo (1.8.6)
187	bson (~> 1.8.6)	188	bson (~> 1.8.6)
	@@ -197,16 +198,17 @@ GEM		@@ -197,16 +198,17 @@ GEM
197	multi_json (1.7.7)	198	multi_json (1.7.7)
198	multi_xml (0.5.4)	199	multi_xml (0.5.4)
199	multipart-post (1.2.0)	200	multipart-post (1.2.0)
200	- net-scp (1.1.1)	201	+ net-scp (1.1.2)
201	net-ssh (>= 2.6.5)	202	net-ssh (>= 2.6.5)
202	net-sftp (2.1.2)	203	net-sftp (2.1.2)
203	net-ssh (>= 2.6.5)	204	net-ssh (>= 2.6.5)
204	- net-ssh (2.6.7)	205	+ net-ssh (2.6.8)
205	net-ssh-gateway (1.2.0)	206	net-ssh-gateway (1.2.0)
206	net-ssh (>= 2.6.5)	207	net-ssh (>= 2.6.5)
207	nokogiri (1.5.10)	208	nokogiri (1.5.10)
208	nokogiri-happymapper (0.5.7)	209	nokogiri-happymapper (0.5.7)
209	nokogiri (~> 1.5)	210	nokogiri (~> 1.5)
		211	+ oauth (0.4.7)
210	oauth2 (0.8.1)	212	oauth2 (0.8.1)
211	faraday (~> 0.8)	213	faraday (~> 0.8)
212	httpauth (~> 0.1)	214	httpauth (~> 0.1)
	@@ -222,7 +224,7 @@ GEM		@@ -222,7 +224,7 @@ GEM
222	omniauth (1.1.4)	224	omniauth (1.1.4)
223	hashie (>= 1.2, < 3)	225	hashie (>= 1.2, < 3)
224	rack	226	rack
225	- omniauth-github (1.1.0)	227	+ omniauth-github (1.1.1)
226	omniauth (~> 1.0)	228	omniauth (~> 1.0)
227	omniauth-oauth2 (~> 1.1)	229	omniauth-oauth2 (~> 1.1)
228	omniauth-oauth2 (1.1.1)	230	omniauth-oauth2 (1.1.1)
	@@ -251,7 +253,7 @@ GEM		@@ -251,7 +253,7 @@ GEM
251	coderay (~> 1.0.5)	253	coderay (~> 1.0.5)
252	method_source (~> 0.8)	254	method_source (~> 0.8)
253	slop (~> 3.4)	255	slop (~> 3.4)
254	- pry-rails (0.3.1)	256	+ pry-rails (0.3.2)
255	pry (>= 0.9.10)	257	pry (>= 0.9.10)
256	quiet_assets (1.0.2)	258	quiet_assets (1.0.2)
257	railties (>= 3.1, < 5.0)	259	railties (>= 3.1, < 5.0)
	@@ -288,22 +290,20 @@ GEM		@@ -288,22 +290,20 @@ GEM
288	rdoc (3.12.2)	290	rdoc (3.12.2)
289	json (~> 1.4)	291	json (~> 1.4)
290	ref (1.0.5)	292	ref (1.0.5)
291	- responders (0.9.3)
292	- railties (~> 3.1)
293	rest-client (1.6.7)	293	rest-client (1.6.7)
294	mime-types (>= 1.16)	294	mime-types (>= 1.16)
295	ri_cal (0.8.8)	295	ri_cal (0.8.8)
296	- rspec-core (2.13.1)
297	- rspec-expectations (2.13.0)	296	+ rspec-core (2.14.4)
		297	+ rspec-expectations (2.14.0)
298	diff-lcs (>= 1.1.3, < 2.0)	298	diff-lcs (>= 1.1.3, < 2.0)
299	- rspec-mocks (2.13.1)
300	- rspec-rails (2.13.2)	299	+ rspec-mocks (2.14.2)
		300	+ rspec-rails (2.14.0)
301	actionpack (>= 3.0)	301	actionpack (>= 3.0)
302	activesupport (>= 3.0)	302	activesupport (>= 3.0)
303	railties (>= 3.0)	303	railties (>= 3.0)
304	- rspec-core (~> 2.13.0)
305	- rspec-expectations (~> 2.13.0)
306	- rspec-mocks (~> 2.13.0)	304	+ rspec-core (~> 2.14.0)
		305	+ rspec-expectations (~> 2.14.0)
		306	+ rspec-mocks (~> 2.14.0)
307	ruby-debug (0.10.4)	307	ruby-debug (0.10.4)
308	columnize (>= 0.1)	308	columnize (>= 0.1)
309	ruby-debug-base (~> 0.10.4.0)	309	ruby-debug-base (~> 0.10.4.0)
	@@ -315,7 +315,7 @@ GEM		@@ -315,7 +315,7 @@ GEM
315	rushover (0.3.0)	315	rushover (0.3.0)
316	json	316	json
317	rest-client	317	rest-client
318	- safe_yaml (0.9.3)	318	+ safe_yaml (0.9.5)
319	selenium-webdriver (2.33.0)	319	selenium-webdriver (2.33.0)
320	childprocess (>= 0.2.5)	320	childprocess (>= 0.2.5)
321	multi_json (~> 1.0)	321	multi_json (~> 1.0)
	@@ -326,7 +326,7 @@ GEM		@@ -326,7 +326,7 @@ GEM
326	multi_json (~> 1.0)	326	multi_json (~> 1.0)
327	simplecov-html (~> 0.7.1)	327	simplecov-html (~> 0.7.1)
328	simplecov-html (0.7.1)	328	simplecov-html (0.7.1)
329	- slop (3.4.5)	329	+ slop (3.4.6)
330	sprockets (2.2.2)	330	sprockets (2.2.2)
331	hike (~> 1.2)	331	hike (~> 1.2)
332	multi_json (~> 1.0)	332	multi_json (~> 1.0)
	@@ -360,18 +360,18 @@ GEM		@@ -360,18 +360,18 @@ GEM
360	railties (> 3.2.8, < 4.0.0)	360	railties (> 3.2.8, < 4.0.0)
361	sprockets (>= 2.0.0)	361	sprockets (>= 2.0.0)
362	tzinfo (0.3.37)	362	tzinfo (0.3.37)
363	- uglifier (2.1.1)	363	+ uglifier (2.1.2)
364	execjs (>= 0.3.0)	364	execjs (>= 0.3.0)
365	multi_json (~> 1.0, >= 1.0.2)	365	multi_json (~> 1.0, >= 1.0.2)
366	- underscore-rails (1.4.4)	366	+ underscore-rails (1.5.1)
367	unicorn (4.6.3)	367	unicorn (4.6.3)
368	kgio (~> 2.6)	368	kgio (~> 2.6)
369	rack	369	rack
370	raindrops (~> 0.7)	370	raindrops (~> 0.7)
371	useragent (0.6.0)	371	useragent (0.6.0)
372	- warden (1.2.1)	372	+ warden (1.2.3)
373	rack (>= 1.0)	373	rack (>= 1.0)
374	- webmock (1.12.0)	374	+ webmock (1.13.0)
375	addressable (>= 2.2.7)	375	addressable (>= 2.2.7)
376	crack (>= 0.3.2)	376	crack (>= 0.3.2)
377	websocket (1.0.7)	377	websocket (1.0.7)
	@@ -412,7 +412,7 @@ DEPENDENCIES		@@ -412,7 +412,7 @@ DEPENDENCIES
412	hoptoad_notifier (~> 2.4)	412	hoptoad_notifier (~> 2.4)
413	htmlentities	413	htmlentities
414	httparty	414	httparty
415	- inherited_resources	415	+ jira-ruby
416	jquery-rails (~> 2.1.4)	416	jquery-rails (~> 2.1.4)
417	kaminari (>= 0.14.1)	417	kaminari (>= 0.14.1)
418	launchy	418	launchy
	@@ -442,7 +442,7 @@ DEPENDENCIES		@@ -442,7 +442,7 @@ DEPENDENCIES
442	taskmapper-unfuddle (~> 0.7.0)	442	taskmapper-unfuddle (~> 0.7.0)
443	therubyracer	443	therubyracer
444	thin	444	thin
445	- timecop	445	+ timecop (= 0.6.1)
446	turbo-sprockets-rails3	446	turbo-sprockets-rails3
447	uglifier (>= 1.0.3)	447	uglifier (>= 1.0.3)
448	underscore-rails	448	underscore-rails
	@@ -423,6 +423,18 @@ card_type = Defect, status = Open, priority = Essential		@@ -423,6 +423,18 @@ card_type = Defect, status = Open, priority = Essential
423	* Project id the id of your project where your ticket is create	423	* Project id the id of your project where your ticket is create
424	* Milestone id the id of your milestone where your ticket is create	424	* Milestone id the id of your milestone where your ticket is create
425		425
		426	+ Jira Issue Integration
		427	+
		428	+* base_url the jira URL
		429	+* context_path Context Path (Just "/" if empty otherwise with leading slash)
		430	+* username HTTP Basic Auth User
		431	+* password HTTP Basic Auth Password
		432	+* project_id The project Key where the issue will be created
		433	+* account Assign to this user. If empty, Jira takes the project default.
		434	+* issue_component Website - Other
		435	+* issue_type Issue type
		436	+* issue_priority Priority
		437	+
426		438
427	What if Errbit has an error?	439	What if Errbit has an error?
428	----------------------------	440	----------------------------
@@ -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?
	@@ -17,6 +17,14 @@ class IssueTracker		@@ -17,6 +17,14 @@ class IssueTracker
17	field :subdomain, :type => String	17	field :subdomain, :type => String
18	field :milestone_id, :type => String	18	field :milestone_id, :type => String
19		19
		20	+ # Is there any better way to enhance the props? Putting them into the subclass leads to
		21	+ # an error while rendering the form fields -.-
		22	+ field :base_url, :type => String
		23	+ field :context_path, :type => String
		24	+ field :issue_type, :type => String
		25	+ field :issue_component, :type => String
		26	+ field :issue_priority, :type => String
		27	+
20	validate :check_params	28	validate :check_params
21		29
22	# Subclasses are responsible for overwriting this method.	30	# Subclasses are responsible for overwriting this method.
	@@ -40,4 +48,15 @@ class IssueTracker		@@ -40,4 +48,15 @@ class IssueTracker
40	def configured?	48	def configured?
41	project_id.present?	49	project_id.present?
42	end	50	end
		51	+
		52	+ ##
		53	+ # Update default_url_option with valid data from the request information
		54	+ #
		55	+ # @param [ Request ] a request with host, port and protocol
		56	+ #
		57	+ def self.update_url_options(request)
		58	+ IssueTracker.default_url_options[:host] = request.host
		59	+ IssueTracker.default_url_options[:port] = request.port
		60	+ IssueTracker.default_url_options[:protocol] = request.scheme
		61	+ end
43	end	62	end
		1	+require 'bitbucket_rest_api'
1	class IssueTrackers::BitbucketIssuesTracker < IssueTracker	2	class IssueTrackers::BitbucketIssuesTracker < IssueTracker
2	Label = "bitbucket"	3	Label = "bitbucket"
3	Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'	4	Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'
	@@ -0,0 +1,109 @@		@@ -0,0 +1,109 @@
		1	+if defined? JIRA
		2	+ class IssueTrackers::JiraTracker < IssueTracker
		3	+ Label = 'jira'
		4	+
		5	+ Fields = [
		6	+ [:base_url, {
		7	+ :label => 'Jira URL without trailing slash',
		8	+ :placeholder => 'https://jira.example.org/'
		9	+ }],
		10	+ [:context_path, {
		11	+ :optional => true,
		12	+ :label => 'Context Path (Just "/" if empty otherwise with leading slash)',
		13	+ :placeholder => "/jira"
		14	+ }],
		15	+ [:username, {
		16	+ :optional => true,
		17	+ :label => 'HTTP Basic Auth User',
		18	+ :placeholder => 'johndoe'
		19	+ }],
		20	+ [:password, {
		21	+ :optional => true,
		22	+ :label => 'HTTP Basic Auth Password',
		23	+ :placeholder => 'p@assW0rd'
		24	+ }],
		25	+ [:project_id, {
		26	+ :label => 'Project Key',
		27	+ :placeholder => 'The project Key where the issue will be created'
		28	+ }],
		29	+ [:account, {
		30	+ :optional => true,
		31	+ :label => 'Assign to this user. If empty, Jira takes the project default.',
		32	+ :placeholder => "username"
		33	+ }],
		34	+ [:issue_component, {
		35	+ :label => 'Issue category',
		36	+ :placeholder => 'Website - Other'
		37	+ }],
		38	+ [:issue_type, {
		39	+ :label => 'Issue type',
		40	+ :placeholder => 'Bug'
		41	+ }],
		42	+ [:issue_priority, {
		43	+ :label => 'Priority',
		44	+ :placeholder => 'Normal'
		45	+ }]
		46	+ ]
		47	+
		48	+ def check_params
		49	+ if Fields.detect { \|f\| self[f[0]].blank? && !f[1][:optional] }
		50	+ errors.add :base, 'You must specify all non optional values!'
		51	+ end
		52	+ end
		53	+
		54	+
		55	+ #
		56	+ # @param problem Problem
		57	+ def create_issue(problem, reported_by = nil)
		58	+ options = {
		59	+ :username => username,
		60	+ :password => password,
		61	+ :site => base_url,
		62	+ :context_path => context_path,
		63	+ :auth_type => :basic
		64	+ }
		65	+ client = JIRA::Client.new(options)
		66	+
		67	+ issue = {
		68	+ :fields => {
		69	+ :project => {
		70	+ :key => project_id
		71	+ },
		72	+ :summary => issue_title(problem),
		73	+ :description => body_template.result(binding),
		74	+ :issuetype => {
		75	+ :name => issue_type
		76	+ },
		77	+ :priority => {
		78	+ :name => issue_priority,
		79	+ },
		80	+
		81	+ :components => [{:name => issue_component}]
		82	+ }
		83	+ }
		84	+
		85	+ issue[:fields][:assignee] = {:name => account} if account
		86	+
		87	+ issue_build = client.Issue.build
		88	+ issue_build.save(issue)
		89	+ issue_build.fetch
		90	+
		91	+ problem.update_attributes(
		92	+ :issue_link => "#{base_url}#{context_path}browse/#{issue_build.key}",
		93	+ :issue_type => Label
		94	+ )
		95	+
		96	+ # Maybe in a later version?
		97	+ #remote_link = {
		98	+ # :url => app_problem_url(problem.app, problem),
		99	+ # :name => "Link to Errbit Issue"
		100	+ #}
		101	+ #remote_link_build = issue_build.remotelink.build
		102	+ #remote_link_build.save(remote_link)
		103	+ end
		104	+
		105	+ def body_template
		106	+ @@body_template \|\|= ERB.new(File.read(Rails.root + "app/views/issue_trackers/jira_body.txt.erb"))
		107	+ end
		108	+ end
		109	+end
0	\ No newline at end of file	110	\ No newline at end of file
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