tests/brightbox/requests/compute/api_client_tests.rb in fog-maestrodev-1.15.0.20130829165835 vs tests/brightbox/requests/compute/api_client_tests.rb in fog-maestrodev-1.15.0.20130927082724

@@ -9,42 +9,42 @@
 
     tests("#create_api_client(#{create_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_api_client(create_options)
       @api_client_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_api_clients") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_api_clients
-      formats(Brightbox::Compute::Formats::Collection::API_CLIENTS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::API_CLIENTS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_api_client('#{@api_client_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
     tests("#reset_secret_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
       test("new secret is visible") { ! result["secret"].nil?  }
     end
 
     tests("#destroy_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, {:allow_extra_keys => true}) { result }
     end
 
   end
 
   tests('failure') do