diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-12 17:13:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-12 17:13:51 +0000 |
| commit | aae8c9434f2a828e2dc9d027338928f91c7b0288 (patch) | |
| tree | 4dedf62e5608f4eb7641f51ae1988356f8619791 | |
| parent | a6a6970961cdfa3908384691ab37d9deb4785841 (diff) | |
| parent | 20d8de8f673e040282ad0811fb8af8fa97aa3e92 (diff) | |
| download | gitlab-ce-aae8c9434f2a828e2dc9d027338928f91c7b0288.tar.gz | |
Merge branch 'remove-unused-helper' into 'master'
Remove unused RelativeUrl spec support file
See merge request !5207
| -rw-r--r-- | spec/spec_helper.rb | 1 | ||||
| -rw-r--r-- | spec/support/relative_url.rb | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 606da1b7605..3638dcbb2d3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,7 +33,6 @@ RSpec.configure do |config| config.include LoginHelpers, type: :request config.include StubConfiguration config.include EmailHelpers - config.include RelativeUrl, type: feature config.include TestEnv config.include ActiveJob::TestHelper config.include StubGitlabCalls diff --git a/spec/support/relative_url.rb b/spec/support/relative_url.rb deleted file mode 100644 index 72e3ccce75b..00000000000 --- a/spec/support/relative_url.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Fix route helpers in tests (e.g. root_path, ...) -module RelativeUrl - extend ActiveSupport::Concern - - included do - default_url_options[:script_name] = Rails.application.config.relative_url_root - end -end |