diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
| commit | 76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch) | |
| tree | f15093086b2ff767968e6bbd1b816c66f35bd5dd /spec/views | |
| parent | fb2b20037bb176533de4e7fa86701248473f8ee3 (diff) | |
| parent | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'spec/views')
| -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 |
6 files changed, 6 insertions, 6 deletions
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 |