Skip to content

Commit

Permalink
Merge pull request #64 from durandom/provider_generator
Browse files Browse the repository at this point in the history
run provider generator to sync changes from core
  • Loading branch information
Fryguy authored Jul 20, 2017
2 parents 747dc3d + eedaa9b commit 236d6f6
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
--require spec_helper
--color
--order random
--exclude-pattern "spec/manageiq/**/*_spec.rb"
1 change: 1 addition & 0 deletions .rspec_ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
--color
--order random
--profile 25
--exclude-pattern "spec/manageiq/**/*_spec.rb"
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ begin
rescue LoadError
end

require 'manageiq-providers-ovirt'
require 'bundler/gem_tasks'

FileList['lib/tasks_private/**/*.rake'].each { |r| load r }
Expand Down
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ unless gem_root.join("spec/manageiq").exist?
end

require gem_root.join("spec/manageiq/lib/manageiq/environment").to_s
ManageIQ::Environment.manageiq_plugin_setup
ManageIQ::Environment.manageiq_plugin_setup(gem_root)
2 changes: 1 addition & 1 deletion bin/update
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ else
end

require gem_root.join("spec/manageiq/lib/manageiq/environment").to_s
ManageIQ::Environment.manageiq_plugin_setup
ManageIQ::Environment.manageiq_plugin_update(gem_root)
1 change: 1 addition & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
:ems:
:ems_ovirt:
:blacklisted_event_names: []
:event_handling:
:event_groups:
:http_proxy:
Expand Down
3 changes: 1 addition & 2 deletions lib/tasks_private/spec.rake
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
namespace :spec do
desc "Setup environment specs"
task :setup => ["app:test:initialize", "app:test:verify_no_db_access_loading_rails_environment", "app:test:setup_db"]
task :setup => ["app:test:vmdb:setup"]
end

desc "Run all specs"
RSpec::Core::RakeTask.new(:spec => ["app:test:initialize", "app:evm:compile_sti_loader"]) do |t|
spec_dir = File.expand_path("../../spec", __dir__)
EvmTestHelper.init_rspec_task(t, ['--require', File.join(spec_dir, 'spec_helper')])
t.pattern = FileList[spec_dir + '/**/*_spec.rb'].exclude(spec_dir + '/manageiq/**/*_spec.rb')
end
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
end

Dir[Rails.root.join("spec/shared/**/*.rb")].each { |f| require f }
Dir[ManageIQ::Providers::Ovirt::Engine.root.join("spec/support/**/*.rb")].each { |f| require f }

0 comments on commit 236d6f6

Please sign in to comment.