From 654ab25fa4659119d5ddaa9ae116fce69a386ab1 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 3 Apr 2013 11:22:16 +0200
Subject: make sure user tests also run when run from users subdir

* The APP_CONFIG needs to be initialized in core so that is required from other engines
* paths for load_views need to be relative to the model - not to rails root.
---
 config/initializers/load_config.rb      |  7 -------
 core/config/initializers/load_config.rb |  7 +++++++
 help/app/models/ticket.rb               |  3 ++-
 users/app/models/user.rb                |  3 ++-
 users/test/integration/api/rack_test.rb | 12 ++++++++++++
 5 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 config/initializers/load_config.rb
 create mode 100644 core/config/initializers/load_config.rb
 create mode 100644 users/test/integration/api/rack_test.rb

diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb
deleted file mode 100644
index b2b0318..0000000
--- a/config/initializers/load_config.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-def load_config_file(file)
-  File.exists?(file) ? YAML.load_file(file)[Rails.env] : {}
-end
-
-defaults = load_config_file("#{Rails.root}/config/defaults.yml") || {}
-config = load_config_file("#{Rails.root}/config/config.yml") || {}
-APP_CONFIG = defaults.merge(config).with_indifferent_access
diff --git a/core/config/initializers/load_config.rb b/core/config/initializers/load_config.rb
new file mode 100644
index 0000000..b2b0318
--- /dev/null
+++ b/core/config/initializers/load_config.rb
@@ -0,0 +1,7 @@
+def load_config_file(file)
+  File.exists?(file) ? YAML.load_file(file)[Rails.env] : {}
+end
+
+defaults = load_config_file("#{Rails.root}/config/defaults.yml") || {}
+config = load_config_file("#{Rails.root}/config/config.yml") || {}
+APP_CONFIG = defaults.merge(config).with_indifferent_access
diff --git a/help/app/models/ticket.rb b/help/app/models/ticket.rb
index a456fe5..738487a 100644
--- a/help/app/models/ticket.rb
+++ b/help/app/models/ticket.rb
@@ -47,7 +47,8 @@ class Ticket < CouchRest::Model::Base
     view :by_is_open_and_created_at
     view :by_is_open_and_updated_at
 
-    load_views(Rails.root.join('help', 'app', 'designs', 'ticket'))
+    own_path = Pathname.new(File.dirname(__FILE__))
+    load_views(own_path.join('..', 'designs', 'ticket'))
   end
 
   validates :title, :presence => true
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index c9b367f..62c5054 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -47,7 +47,8 @@ class User < CouchRest::Model::Base
   timestamps!
 
   design do
-    load_views(Rails.root.join('users', 'app', 'designs', 'user'))
+    own_path = Pathname.new(File.dirname(__FILE__))
+    load_views(own_path.join('..', 'designs', 'user'))
     view :by_login
     view :by_created_at
   end
diff --git a/users/test/integration/api/rack_test.rb b/users/test/integration/api/rack_test.rb
new file mode 100644
index 0000000..da960f2
--- /dev/null
+++ b/users/test/integration/api/rack_test.rb
@@ -0,0 +1,12 @@
+CONFIG_RU = (Rails.root + 'config.ru').to_s
+OUTER_APP = Rack::Builder.parse_file(CONFIG_RU).first
+
+class RackTest < ActiveSupport::TestCase
+  include Rack::Test::Methods
+  include Warden::Test::Helpers
+  include LeapWebCore::AssertResponses
+
+  def app
+    OUTER_APP
+  end
+end
-- 
cgit v1.2.3