studio_api 3.1.0 → 3.1.1

data/test/build_test.rb

@@ -1,45 +1,42 @@
-require 'rubygems'
-require 'active_support'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
-$:.unshift File.join( File.dirname(__FILE__), '..', 'lib')
-require 'studio_api/build'
-require 'studio_api/connection'
+require 'test_helper'
 
 class BuildTest < Test::Unit::TestCase
-  BUILD_ID = 509559
-  APPLIANCE_ID = 269186
-
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__), "responses", name))
-  end
 
   def setup
-    @connection = StudioApi::Connection.new("test", "test", "http://localhost")
-    StudioApi::Build.studio_connection = @connection
-
-    builds_out = respond_load "builds.xml"
-    build_out = respond_load "build.xml"
+    @build_id = 509559
+    @appliance_id = 269186
 
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/builds?appliance_id=#{APPLIANCE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, builds_out, 200
-      mock.get "/builds/#{BUILD_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, build_out, 200
-      mock.delete "/builds/#{BUILD_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, build_out, 200
-    end
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+    StudioApi::Build.studio_connection = @connection
+  end
+  
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
-    res = StudioApi::Build.find :all, :params => {:appliance_id => APPLIANCE_ID}
+    register_fake_response_from_file :get, "/api/builds?appliance_id=#{@appliance_id}",
+                                     'builds.xml'
+    res = StudioApi::Build.find :all, :params => {:appliance_id => @appliance_id}
     assert_equal 1, res.size
-    res = StudioApi::Build.find BUILD_ID
+
+    register_fake_response_from_file :get, "/api/builds/#{@build_id}",
+                                     'build.xml'
+    res = StudioApi::Build.find @build_id
     assert_equal "true", res.expired
   end
 
   def test_delete
-    build = StudioApi::Build.find BUILD_ID
+    register_fake_response_from_file :get, "/api/builds/#{@build_id}",
+                                     'build.xml'
+    register_fake_response_from_file :delete, "/api/builds/#{@build_id}",
+                                     'build.xml'
+
+    build = StudioApi::Build.find @build_id
     assert build.destroy
-    assert StudioApi::Build.delete BUILD_ID
+    assert StudioApi::Build.delete @build_id
   end
 
 end

data/test/connection_test.rb

@@ -1,19 +1,19 @@
-require "rubygems"
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/connection'
-require 'studio_api/generic_request'
-
-require 'mocha'
-require 'test/unit'
+require 'test_helper'
 
 class ConnectionTest < Test::Unit::TestCase
   def setup
-    @connection = StudioApi::Connection.new("test","test","http://localhost/api/user")
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+  end
+
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
-FAKE_API_VERSION_RESPONSE = "<version>1.0</version>"
   def test_api_version
-    StudioApi::GenericRequest.any_instance.stubs(:get).with("/api_version").returns(FAKE_API_VERSION_RESPONSE).once
+    register_fake_response_from_file :get, "/api/api_version",
+                                     'api_version.xml'
     assert_equal "1.0",@connection.api_version
     @connection.api_version #test caching, if it again call, then mocha raise exception
   end

data/test/file_test.rb

@@ -1,52 +1,49 @@
-require 'rubygems'
-require 'active_support'
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/file'
-require 'studio_api/connection'
-
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
+require 'test_helper'
 
 #FileTest cause collistion of names
 class File1Test < Test::Unit::TestCase
-  APPLIANCE_ID=488
-  FILE_ID = 1234765
-
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__),"responses",name))
-  end
 
   def setup
-    @connection = StudioApi::Connection.new("test","test","http://localhost")
+    @appliance_id=488
+    @file_id = 1234765
+
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
     StudioApi::File.studio_connection = @connection
-    files_out = respond_load "files.xml"
-    file_out = respond_load "file.xml"
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/files?appliance_id=#{APPLIANCE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"},files_out,200
-      mock.get "/files/#{FILE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"},file_out,200
-      mock.delete "/files/#{FILE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"},file_out,200
-      mock.put "/files/#{FILE_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"},file_out,200
-    end
   end
 
   def test_find
-    res = StudioApi::File.find :all, :params => { :appliance_id => APPLIANCE_ID }
+    register_fake_response_from_file :get, "/api/files?appliance_id=#{@appliance_id}",
+                                     'files.xml'
+    res = StudioApi::File.find :all, :params => { :appliance_id => @appliance_id }
     assert_equal 1, res.size
     assert_equal "http://susestudio.com/file/download/214486/1234765", res[0].download_url
-    res = StudioApi::File.find FILE_ID
+
+    register_fake_response_from_file :get, "/api/files/#{@file_id}",
+                                     'file.xml'
+    res = StudioApi::File.find @file_id
     assert_equal "http://susestudio.com/file/download/214486/1234765", res.download_url
   end
 
   def test_delete
-    assert StudioApi::File.find(FILE_ID).destroy
-    assert StudioApi::File.delete FILE_ID #different way
+    register_fake_response_from_file :get, "/api/files/#{@file_id}",
+                                     'file.xml'
+    register_fake_response_from_file :delete, "/api/files/#{@file_id}",
+                                     'file.xml'
+    assert StudioApi::File.find(@file_id).destroy
+    assert StudioApi::File.delete @file_id #different way
   end
 
   def test_update
-    f = StudioApi::File.find(FILE_ID)
-    f.path = "/tmp"
-    assert f.save
+   register_fake_response_from_file :get, "/api/files/#{@file_id}",
+                                    'file.xml'
+   register_fake_response_from_file :put, "/api/files/#{@file_id}",
+                                    'file.xml'
+
+   f = StudioApi::File.find(@file_id)
+   f.path = "/tmp"
+   assert f.save
   end
 end
 

data/test/gallery_test.rb

@@ -1,48 +1,38 @@
-require 'rubygems'
-require 'active_support'
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/gallery'
-require 'studio_api/connection'
-require 'studio_api/generic_request'
-require 'studio_api/util'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
+require 'test_helper'
 
 class GalleryTest < Test::Unit::TestCase
-  APPLIANCE_ID = 130166
-  APPL_VERSION = "0.1.1"
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__),"responses",name))
-  end
-
   def setup
-    @connection = StudioApi::Connection.new("test","test","http://localhost/api/")
+    @appliance_id = 130166
+    @appliance_version = "0.1.1"
+
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
     StudioApi::Util.configure_studio_connection @connection
   end
 
   def teardown
-    Mocha::Mockery.instance.stubba.unstub_all
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
-    gallery_out = respond_load "gallery.xml"
-    StudioApi::GenericRequest.any_instance.stubs(:get).with("/gallery/appliances?popular&per_page=10").returns(gallery_out)
+    register_fake_response_from_file :get, "/api/gallery/appliances?popular&per_page=10",
+                                     'gallery.xml'
     out = StudioApi::Gallery.find_appliance :popular, :per_page => 10
     assert_equal 10, out[:appliances].size
   end
 
   def test_appliance
-    gallery_appliance_out = respond_load "gallery_appliance.xml"
-    StudioApi::GenericRequest.any_instance.stubs(:get).with("/gallery/appliances/#{APPLIANCE_ID}/version/#{APPL_VERSION}").returns(gallery_appliance_out)
-    out = StudioApi::Gallery.appliance APPLIANCE_ID, APPL_VERSION
+    register_fake_response_from_file :get, "/api/gallery/appliances/#{@appliance_id}/version/#{@appliance_version}",
+                                     'gallery_appliance.xml'
+    out = StudioApi::Gallery.appliance @appliance_id, @appliance_version
     assert out
   end
 
   def test_gallery_appliance_versions
-    versions_out = respond_load "versions.xml"
-    StudioApi::GenericRequest.any_instance.stubs(:get).with("/gallery/appliances/#{APPLIANCE_ID}/versions").returns(versions_out)
-    out = StudioApi::Gallery::Appliance.new(:id => APPLIANCE_ID).versions
+    register_fake_response_from_file :get, "/api/gallery/appliances/#{@appliance_id}/versions",
+                                     'versions.xml'
+    out = StudioApi::Gallery::Appliance.new(:id => @appliance_id).versions
     assert_equal 6,out.size
   end
 

data/test/generic_request_test.rb

@@ -1,50 +1,44 @@
-require 'rubygems'
-require 'mocha'
-require 'test/unit'
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/generic_request'
-require 'studio_api/connection'
-require 'net/http'
+require 'test_helper'
 
 class GenericRequestTest < Test::Unit::TestCase
   def setup
-    Mocha::Mockery.instance.stubba.unstub_all
-    @connection = StudioApi::Connection.new("test","test","http://localhost")
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+    StudioApi::Build.studio_connection = @connection
+    
+    @test_response = "Test response"
   end
 
   def teardown
-    Mocha::Mockery.instance.stubba.unstub_all
+    FakeWeb.allow_net_connect = false
   end
 
-ERROR_RESPONSE = <<EOF
-<error>
-<code>invalid_base_system</code>
-<message>Invalid base system.</message>
-</error>
-EOF
   def test_get
-    test_response = "Test response"
-    StudioApi::GenericRequest.any_instance.stubs(:do_request).returns test_response
-    assert_equal test_response, StudioApi::GenericRequest.new(@connection).get("test")
+    register_fake_response :get, "/api/test", @test_response
+    assert_equal @test_response, StudioApi::GenericRequest.new(@connection).get("test")
   end
 
   def test_post
-    test_response = "Test response"
-    StudioApi::GenericRequest.any_instance.stubs(:do_request).returns test_response
-    assert_equal test_response, StudioApi::GenericRequest.new(@connection).post("test",:file => "/dev/zero")
+    register_fake_response :post, "/api/test", @test_response
+    assert_equal @test_response,
+      StudioApi::GenericRequest.new(@connection).post("test",:file => "/dev/zero")
   end
 
   def test_error_response
-    response = Net::HTTPServiceUnavailable.new("4.1",503,"Unnavailable")
-    response.instance_variable_set "@body", ERROR_RESPONSE
-    response.instance_variable_set "@read", true #avoid real reading
-    Net::HTTP.any_instance.stubs(:request).returns(response)
-    rq = StudioApi::GenericRequest.new(@connection)
-    http_var = rq.instance_variable_get("@http")
-    def http_var.start
-      yield
+    error_response = <<-EOF
+    <error>
+    <code>invalid_base_system</code>
+    <message>Invalid base system.</message>
+    </error>
+    EOF
+    url = "http://#{@@username}:#{@@password}@localhost/api/test"
+    FakeWeb.register_uri(:get, url, :body => error_response,
+                         :status => ["503", "Unavailable"])
+
+    assert_raises(ActiveResource::ServerError) do
+      StudioApi::GenericRequest.new(@connection).get("test")
     end
-    assert_raises(ActiveResource::ServerError) { rq.get("test") }
   end
 
   def test_mime_type
@@ -56,7 +50,9 @@ EOF
   end
 
   def test_ssl_settings
-    @connection = StudioApi::Connection.new("test","test","https://localhost",:ssl => { :verify_mode => OpenSSL::SSL::VERIFY_PEER, :ca_path => "/dev/null" })
+    @connection = StudioApi::Connection.new("test","test","https://localhost",
+                                            :ssl => { :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+                                            :ca_path => "/dev/null" })
     rq = StudioApi::GenericRequest.new @connection
     http_var = rq.instance_variable_get("@http")
     assert http_var.use_ssl?

data/test/repository_test.rb

@@ -1,42 +1,38 @@
-require 'rubygems'
-require 'active_support'
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/repository'
-require 'studio_api/appliance'
-require 'studio_api/connection'
-
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
+require 'test_helper'
 
 class RepositoryTest < Test::Unit::TestCase
-REPOSITORY_ID = 6343
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__),"responses",name))
-  end
   def setup
-    @connection = StudioApi::Connection.new("test","test","http://localhost")
+    @repository_id = 6343
+
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
     StudioApi::Repository.studio_connection = @connection
-    repositories_out = respond_load "repositories.xml"
-    repository_out = respond_load "repository.xml"
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/repositories?base_system=sle11sp1", {"Authorization"=>"Basic dGVzdDp0ZXN0"},repositories_out,200
-      mock.post "/repositories?name=test&url=http%3A%2F%2Ftest", {"Authorization"=>"Basic dGVzdDp0ZXN0"},repository_out,200
-      mock.get "/repositories/#{REPOSITORY_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"},repository_out,200
-    end
+  end
+
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
+    register_fake_response_from_file :get, "/api/repositories?base_system=sle11sp1",
+                                     'repositories.xml'
+    
     res = StudioApi::Repository.find :all, :params => {:base_system => "sle11sp1"}
     assert_equal 5,res.size
-    res = StudioApi::Repository.find REPOSITORY_ID
-    assert_equal REPOSITORY_ID, res.id.to_i
+
+    register_fake_response_from_file :get, "/api/repositories/#{@repository_id}",
+                                     'repository.xml'
+    res = StudioApi::Repository.find @repository_id
+    assert_equal @repository_id, res.id.to_i
   end
 
   def test_import
-    res = StudioApi::Repository.import "http://test","test"
-    assert res
-    assert_equal REPOSITORY_ID, res.id.to_i
+   register_fake_response_from_file :post, "/api/repositories?name=test&url=http%3A%2F%2Ftest",
+                                    'repository.xml'
+   res = StudioApi::Repository.import "http://test","test"
+   assert res
+   assert_equal @repository_id, res.id.to_i
   end
 end
 

data/test/resource_test.rb

@@ -1,12 +1,4 @@
-require 'rubygems'
-require 'active_support'
-$:.unshift File.join( File.dirname(__FILE__),'..','lib')
-require 'studio_api/studio_resource'
-require 'studio_api/connection'
-
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
+require 'test_helper'
 
 class MyTest < ActiveResource::Base
   extend StudioApi::StudioResource

data/test/responses/api_version.xml

@@ -0,0 +1 @@
+<version>1.0</version>

data/test/responses/running_build_image_already_exists.xml

@@ -0,0 +1,4 @@
+<error>
+  <code>image_already_exists</code>
+  <message>Image already exists. Change version or type or force an overwrite.</message>
+</error>

data/test/responses/software_fake_response.xml

@@ -0,0 +1,9 @@
+<success>
+ <details>
+   <status>
+     <state>changed</state>
+     <packages_added>13</packages_added>
+     <packages_removed>0</packages_removed>
+   </status>
+ </details>
+</success>

data/test/rpm_test.rb

@@ -1,59 +1,53 @@
-require 'rubygems'
-require 'active_support'
-require 'active_resource/http_mock'
-require 'mocha'
-require 'test/unit'
-require 'tempfile'
-$:.unshift File.join( File.dirname(__FILE__), '..', 'lib')
-require 'studio_api/rpm'
-require 'studio_api/connection'
-require 'studio_api/generic_request'
+require 'test_helper'
 
 class RpmTest < Test::Unit::TestCase
-  APPLIANCE_ID = 269186
-  RPM_ID = 27653
-
-  def respond_load name
-    IO.read(File.join(File.dirname(__FILE__), "responses", name))
-  end
 
   def setup
-    @connection = StudioApi::Connection.new("test", "test", "http://localhost")
-    StudioApi::Rpm.studio_connection = @connection
+    @appliance_id = 269186
+    @rpm_id = 27653
+    @rpm_data = "My lovely testing string\n Doodla da da da nicht"
 
-    rpms_out = respond_load "rpms.xml"
-    rpm_out = respond_load "rpm.xml"
+    FakeWeb.clean_registry
+    FakeWeb.allow_net_connect = false
+    @connection = StudioApi::Connection.new(@@username, @@password,"http://localhost/api/")
+    StudioApi::Rpm.studio_connection = @connection
+  end
 
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/rpms?base_system=sle11_sp1", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, rpms_out, 200
-      mock.get "/rpms/#{RPM_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, rpm_out, 200
-      mock.delete "/rpms/#{RPM_ID}", {"Authorization"=>"Basic dGVzdDp0ZXN0"}, rpm_out, 200
-    end
+  def teardown
+    FakeWeb.allow_net_connect = false
   end
 
   def test_find
+    register_fake_response_from_file :get, "/api/rpms?base_system=sle11_sp1",
+                                     'rpms.xml'
     res = StudioApi::Rpm.find :all, :params => {:base_system => "sle11_sp1"}
     assert_equal 48, res.size
-    res = StudioApi::Rpm.find RPM_ID
+
+    register_fake_response_from_file :get, "/api/rpms/#{@rpm_id}",
+                                     'rpm.xml'
+    res = StudioApi::Rpm.find @rpm_id
     assert "false", res.archive
   end
 
   def test_delete
-    rpm = StudioApi::Rpm.find RPM_ID
+    register_fake_response_from_file :get, "/api/rpms/#{@rpm_id}",
+                                     'rpm.xml'
+    register_fake_response_from_file :delete, "/api/rpms/#{@rpm_id}",
+                                     'rpm.xml'
+    rpm = StudioApi::Rpm.find @rpm_id
     assert rpm.destroy
-    assert StudioApi::Rpm.delete RPM_ID
+    assert StudioApi::Rpm.delete @rpm_id
   end
 
-TEST_STRING = "My lovely testing string\n Doodla da da da nicht"
   def test_download
-    StudioApi::GenericRequest.any_instance.stubs(:get).with("/rpms/#{RPM_ID}/data").returns(TEST_STRING)
-    assert_equal TEST_STRING, StudioApi::Rpm.new(:id=> RPM_ID).content
+    register_fake_response :get, "/api/rpms/#{@rpm_id}/data", @rpm_data
+    assert_equal @rpm_data, StudioApi::Rpm.new(:id=> @rpm_id).content
   end
 
-  def test_upload
-    rpm_out = respond_load "rpm.xml"
-    StudioApi::GenericRequest.any_instance.stubs(:post).returns(rpm_out)
-    assert StudioApi::Rpm.upload(TEST_STRING, "SLE11")
-  end
+   def test_upload
+     register_fake_response_from_file :post, "/api/rpms?base_system=SLE11",
+                                     'rpm.xml'
+     assert StudioApi::Rpm.upload(@rpm_data, "SLE11")
+   end
 
 end