summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-27 15:43:50 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-27 15:47:05 -0400
commite3d2304d6971c42436e711ccf70b8e4d5114f887 (patch)
tree3728778bc24ffa04a0e456934c6a1ee34b3f26b5 /spec
parent2c90579749459f0d4d5d534785aa3006bec1a444 (diff)
downloadgitlab-ce-e3d2304d6971c42436e711ccf70b8e4d5114f887.tar.gz
Specs don't need to set default_url_options anymore
Diffstat (limited to 'spec')
-rw-r--r--spec/features/users_spec.rb7
-rw-r--r--spec/support/reference_filter_spec_helper.rb11
2 files changed, 0 insertions, 18 deletions
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 4cfaab03caf..93d2b18b5fc 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -1,13 +1,6 @@
require 'spec_helper'
feature 'Users' do
- around do |ex|
- old_url_options = Rails.application.routes.default_url_options
- Rails.application.routes.default_url_options = { host: 'example.foo' }
- ex.run
- Rails.application.routes.default_url_options = old_url_options
- end
-
scenario 'GET /users/sign_in creates a new user account' do
visit new_user_session_path
fill_in 'user_name', with: 'Name Surname'
diff --git a/spec/support/reference_filter_spec_helper.rb b/spec/support/reference_filter_spec_helper.rb
index bcee5715cad..0e035f0e597 100644
--- a/spec/support/reference_filter_spec_helper.rb
+++ b/spec/support/reference_filter_spec_helper.rb
@@ -4,17 +4,6 @@
module ReferenceFilterSpecHelper
extend ActiveSupport::Concern
- included do
- before { set_default_url_options }
- end
-
- # Allow *_url helpers to work
- def set_default_url_options
- Rails.application.routes.default_url_options = {
- host: 'example.foo'
- }
- end
-
# Shortcut to Rails' auto-generated routes helpers, to avoid including the
# module
def urls