Skip to content

Commit

Permalink
load spec_helper from manageiq like all of the other plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
bdunne committed Oct 31, 2017
1 parent fada84c commit 7803040
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
--require manageiq/spec/spec_helper
--require spec_helper
--color
--order random
--exclude-pattern "spec/manageiq/**/*_spec.rb"
2 changes: 2 additions & 0 deletions .rspec_ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
--require manageiq/spec/spec_helper
--require spec_helper
--color
--order random
--profile 25
--exclude-pattern "spec/manageiq/**/*_spec.rb"
4 changes: 1 addition & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

# TODO: isolate the helpers we need for UI specs instead of general Dir glob
#
# core_support_path = Rails.root.join('spec/support')
# require core_support_path.join('evm_spec_helper.rb')
# require core_support_path.join('auth_helper.rb')
# require core_support_path.join('controller_helper.rb')
# require core_support_path.join('presenter_helper.rb')
# require core_support_path.join('menu_helper.rb')
# require core_support_path.join('automation_helper.rb')
Expand All @@ -28,8 +28,6 @@
# Known:
# require core_support_path.join("examples_group/shared_examples_for_application_helper.rb")
# require core_support_path.join("rake_task_example_group.rb")
core_support_path = Rails.root / 'spec/support'
Dir[core_support_path.join("**/*.rb")].each { |f| require f }
Dir[Rails.root.join('spec', 'shared', '**', '*.rb')].each { |f| require f }

Dir[ManageIQ::UI::Classic::Engine.root.join('spec/shared/controllers/**/*.rb')].each { |f| require f }
Expand Down

0 comments on commit 7803040

Please sign in to comment.