From 915573311a92df28ba370326542589982aa6febc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 5 Jul 2014 12:34:33 +0200
Subject: minor: remove dummy dependency in engine test_helpers

This was causing problems with zeus
---
 engines/support/test/test_helper.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/support/test')

diff --git a/engines/support/test/test_helper.rb b/engines/support/test/test_helper.rb
index fff9173..57cdd63 100644
--- a/engines/support/test/test_helper.rb
+++ b/engines/support/test/test_helper.rb
@@ -1,7 +1,6 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path('../../../../test/dummy/config/environment', __FILE__)
 require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!
-- 
cgit v1.2.3


From c8fc45c21d72837d5a6bd41ffca18b3ac52a305f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 5 Jul 2014 12:49:44 +0200
Subject: stay on all tickets view when sorting (#5879)

When an admin sorted the tickets view in a different order it would take them to their own tickets list before
---
 engines/support/test/integration/navigation_test.rb | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'engines/support/test')

diff --git a/engines/support/test/integration/navigation_test.rb b/engines/support/test/integration/navigation_test.rb
index eec8c0e..1cf5825 100644
--- a/engines/support/test/integration/navigation_test.rb
+++ b/engines/support/test/integration/navigation_test.rb
@@ -1,9 +1,20 @@
 require 'test_helper'
 
-class NavigationTest < ActionDispatch::IntegrationTest
+class NavigationTest < BrowserIntegrationTest
 
-  # test "the truth" do
-  #   assert true
-  # end
+  #
+  # this is a regression test for #5879
+  #
+  test "admin can navigate all tickets" do
+    login
+    with_config admins: [@user.login] do
+      visit '/'
+      click_on 'Tickets'
+      click_on 'Created at'
+      uri = URI.parse(current_url)
+      assert_equal '/tickets', uri.path
+      assert_equal 'open_status=open&sort_order=created_at_desc', uri.query
+    end
+  end
 end
 
-- 
cgit v1.2.3


From 9d83092405745f6d1b07a57fd8d2aa8e9bffd9fa Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 5 Jul 2014 13:10:50 +0200
Subject: minor: cleanup some links

only submit the params that differ from the defaults
---
 engines/support/test/integration/navigation_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/support/test')

diff --git a/engines/support/test/integration/navigation_test.rb b/engines/support/test/integration/navigation_test.rb
index 1cf5825..13d51b6 100644
--- a/engines/support/test/integration/navigation_test.rb
+++ b/engines/support/test/integration/navigation_test.rb
@@ -13,7 +13,7 @@ class NavigationTest < BrowserIntegrationTest
       click_on 'Created at'
       uri = URI.parse(current_url)
       assert_equal '/tickets', uri.path
-      assert_equal 'open_status=open&sort_order=created_at_desc', uri.query
+      assert_equal 'sort_order=created_at_desc', uri.query
     end
   end
 end
-- 
cgit v1.2.3


From 7b368ac4825686458be38460d8a77f4e9e0139ef Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 9 Jul 2014 22:03:59 +0200
Subject: adopt ticket list test to new behaviour

We completely ingnore the user_id param for non admins now. So if someone tries to show somebody elses tickets they will see their own instead.
---
 engines/support/test/functional/tickets_controller_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/support/test')

diff --git a/engines/support/test/functional/tickets_controller_test.rb b/engines/support/test/functional/tickets_controller_test.rb
index ebaa3a4..e36f5f6 100644
--- a/engines/support/test/functional/tickets_controller_test.rb
+++ b/engines/support/test/functional/tickets_controller_test.rb
@@ -64,11 +64,12 @@ class TicketsControllerTest < ActionController::TestCase
     assert_access_denied
   end
 
-  test "ticket list of other user is not visible" do
+  test "normal user only gets own ticket list" do
     other_user = find_record :user
     login
     get :index, :user_id => other_user.id
-    assert_access_denied
+    assert_equal @current_user, assigns(:user)
+    assert_nil assigns(:tickets).detect{|t| t.created_by != @user}
   end
 
   test "should create unauthenticated ticket" do
-- 
cgit v1.2.3