From 411fc10821cf005f31ef9db99baa753ddcb53320 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 16 Dec 2013 19:11:38 -0300
Subject: [PATCH] Clean context_content plugin tests

---
 plugins/context_content/test/functional/content_viewer_controller_test.rb                 | 2 +-
 plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb | 2 +-
 plugins/context_content/test/functional/profile_design_controller_test.rb                 | 2 +-
 plugins/context_content/test/test_helper.rb                                               | 1 -
 plugins/context_content/test/unit/context_content_block_test.rb                           | 2 +-
 plugins/context_content/test/unit/context_content_plugin_test.rb                          | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 plugins/context_content/test/test_helper.rb

diff --git a/plugins/context_content/test/functional/content_viewer_controller_test.rb b/plugins/context_content/test/functional/content_viewer_controller_test.rb
index 5532ca0..a20b37d 100644
--- a/plugins/context_content/test/functional/content_viewer_controller_test.rb
+++ b/plugins/context_content/test/functional/content_viewer_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContentViewerController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
diff --git a/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb b/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
index b55ae73..28c98fc 100644
--- a/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
+++ b/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContextContentPluginProfileControllerTest < ActionController::TestCase
 
diff --git a/plugins/context_content/test/functional/profile_design_controller_test.rb b/plugins/context_content/test/functional/profile_design_controller_test.rb
index 77124f7..9f3b44e 100644
--- a/plugins/context_content/test/functional/profile_design_controller_test.rb
+++ b/plugins/context_content/test/functional/profile_design_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ProfileDesignController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
diff --git a/plugins/context_content/test/test_helper.rb b/plugins/context_content/test/test_helper.rb
deleted file mode 100644
index cca1fd3..0000000
--- a/plugins/context_content/test/test_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/context_content/test/unit/context_content_block_test.rb b/plugins/context_content/test/unit/context_content_block_test.rb
index e8551ea..fa27cd4 100644
--- a/plugins/context_content/test/unit/context_content_block_test.rb
+++ b/plugins/context_content/test/unit/context_content_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContextContentBlockTest < ActiveSupport::TestCase
 
diff --git a/plugins/context_content/test/unit/context_content_plugin_test.rb b/plugins/context_content/test/unit/context_content_plugin_test.rb
index ffdf5dd..e000641 100644
--- a/plugins/context_content/test/unit/context_content_plugin_test.rb
+++ b/plugins/context_content/test/unit/context_content_plugin_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ContextContentPluginTest < ActiveSupport::TestCase
 
--
libgit2 0.21.2