diff options
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | lib/languages.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 1 | ||||
| -rw-r--r-- | spec/views/public_body/show.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request/_after_actions.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request/_describe_state.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request/list.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request/show.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request_game/play.rhtml_spec.rb | 2 |
12 files changed, 12 insertions, 7 deletions
diff --git a/config/routes.rb b/config/routes.rb index 48bf92e75..511b5fc1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do |map| # Keep in mind you can assign values other than :controller and :action # Allow easy extension from themes. Note these will have the highest priority. - require 'config/custom-routes' + require File.join(Rails.root, 'config', 'custom-routes') map.with_options :controller => 'general' do |general| general.frontpage '/', :action => 'frontpage' diff --git a/lib/languages.rb b/lib/languages.rb index 43212a777..474c0e0cb 100644 --- a/lib/languages.rb +++ b/lib/languages.rb @@ -1,3 +1,4 @@ +# coding: utf-8 class LanguageNames def self.get_language_name(locale) language_names = { diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 8e1e4589f..fe994c916 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index ae771da04..824cc9c42 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index ffb8cb178..6a55c34da 100644 --- a/spec/lib/tmail_extensions_spec.rb +++ b/spec/lib/tmail_extensions_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 # This is a test of the set_content_type monkey patch in # lib/tmail_extensions.rb diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index a8411bc34..2b89338f5 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index cd81888eb..a37d8be0d 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe "when viewing a body" do before do diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb index c73f35d33..6a56e7a71 100644 --- a/spec/views/request/_after_actions.rhtml_spec.rb +++ b/spec/views/request/_after_actions.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe 'when displaying actions that can be taken with regard to a request' do diff --git a/spec/views/request/_describe_state.rhtml_spec.rb b/spec/views/request/_describe_state.rhtml_spec.rb index 9fb776db3..ccf653b1b 100644 --- a/spec/views/request/_describe_state.rhtml_spec.rb +++ b/spec/views/request/_describe_state.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe 'when showing the form for describing the state of a request' do diff --git a/spec/views/request/list.rhtml_spec.rb b/spec/views/request/list.rhtml_spec.rb index 60a28eec5..1f86ec641 100644 --- a/spec/views/request/list.rhtml_spec.rb +++ b/spec/views/request/list.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe "when listing recent requests" do diff --git a/spec/views/request/show.rhtml_spec.rb b/spec/views/request/show.rhtml_spec.rb index ca4663afc..adb244f47 100644 --- a/spec/views/request/show.rhtml_spec.rb +++ b/spec/views/request/show.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe 'when viewing an information request' do diff --git a/spec/views/request_game/play.rhtml_spec.rb b/spec/views/request_game/play.rhtml_spec.rb index e90861e34..24fb6d75d 100644 --- a/spec/views/request_game/play.rhtml_spec.rb +++ b/spec/views/request_game/play.rhtml_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe 'when viewing the request game' do |