From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/tests/common.rb | 15 +++++++-------- server/tests/drivers/openstack/api_test.rb | 7 ++++++- .../tests/drivers/openstack/hardware_profiles_test.rb | 7 ++++++- server/tests/drivers/openstack/images_test.rb | 7 ++++++- server/tests/drivers/openstack/instances_test.rb | 7 ++++++- server/tests/drivers/openstack/realms_test.rb | 7 ++++++- 6 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 server/tests/drivers/openstack/common.rb diff --git a/server/tests/common.rb b/server/tests/common.rb index 528f86d..9d557cf 100644 --- a/server/tests/common.rb +++ b/server/tests/common.rb @@ -28,9 +28,14 @@ require 'json' require 'digest/sha1' require 'base64' require 'rack/test' -require "%s/server" % (ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud') -driver +load File.join(File.dirname(__FILE__), '..', 'lib', 'deltacloud_rack.rb') + +Deltacloud::configure do |server| + server.root_url '/api' + server.version '0.5.0' + server.klass 'Deltacloud::API' +end.require_frontend! # Set proper environment variables for running test @@ -38,12 +43,6 @@ ENV['RACK_ENV'] = 'test' ENV['API_HOST'] = 'localhost' ENV['API_PORT'] = '4040' -configure :test do - set :environment, :test - set :raise_errors, false - set :show_exceptions, false -end - RSpec.configure do |conf| conf.include Rack::Test::Methods conf.expect_with :rspec diff --git a/server/tests/drivers/openstack/api_test.rb b/server/tests/drivers/openstack/api_test.rb index 14861b0..b9c3fb2 100644 --- a/server/tests/drivers/openstack/api_test.rb +++ b/server/tests/drivers/openstack/api_test.rb @@ -7,7 +7,12 @@ module OpenstackTest include Rack::Test::Methods def app - Sinatra::Application + Rack::Builder.new { + map '/' do + use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public" + run Rack::Cascade.new([Deltacloud::API]) + end + } end def test_01_it_returns_entry_points diff --git a/server/tests/drivers/openstack/common.rb b/server/tests/drivers/openstack/common.rb new file mode 100644 index 0000000..e69de29 diff --git a/server/tests/drivers/openstack/hardware_profiles_test.rb b/server/tests/drivers/openstack/hardware_profiles_test.rb index 0744011..68a4f0c 100644 --- a/server/tests/drivers/openstack/hardware_profiles_test.rb +++ b/server/tests/drivers/openstack/hardware_profiles_test.rb @@ -7,7 +7,12 @@ module OpenstackTest include Rack::Test::Methods def app - Sinatra::Application + Rack::Builder.new { + map '/' do + use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public" + run Rack::Cascade.new([Deltacloud::API]) + end + } end def test_01_it_returns_hardware_profiles diff --git a/server/tests/drivers/openstack/images_test.rb b/server/tests/drivers/openstack/images_test.rb index 9b71653..3049364 100644 --- a/server/tests/drivers/openstack/images_test.rb +++ b/server/tests/drivers/openstack/images_test.rb @@ -7,7 +7,12 @@ module OpenstackTest include Rack::Test::Methods def app - Sinatra::Application + Rack::Builder.new { + map '/' do + use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public" + run Rack::Cascade.new([Deltacloud::API]) + end + } end def test_01_it_returns_images diff --git a/server/tests/drivers/openstack/instances_test.rb b/server/tests/drivers/openstack/instances_test.rb index c2e2b76..d7da173 100644 --- a/server/tests/drivers/openstack/instances_test.rb +++ b/server/tests/drivers/openstack/instances_test.rb @@ -7,7 +7,12 @@ module OpenstackTest include Rack::Test::Methods def app - Sinatra::Application + Rack::Builder.new { + map '/' do + use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public" + run Rack::Cascade.new([Deltacloud::API]) + end + } end def test_01_01_it_can_create_instance_without_hardware_profile diff --git a/server/tests/drivers/openstack/realms_test.rb b/server/tests/drivers/openstack/realms_test.rb index f62a6f9..613e5ec 100644 --- a/server/tests/drivers/openstack/realms_test.rb +++ b/server/tests/drivers/openstack/realms_test.rb @@ -7,7 +7,12 @@ module OpenstackTest include Rack::Test::Methods def app - Sinatra::Application + Rack::Builder.new { + map '/' do + use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public" + run Rack::Cascade.new([Deltacloud::API]) + end + } end def test_01_it_returns_realms -- 1.7.10.1
