[api] fix test suite

openSUSE · Dec 21, 2012 · ea95ded · ea95ded
1 parent 164f9ec
commit ea95ded
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/api/app/controllers/public_controller.rb b/src/api/app/controllers/public_controller.rb
@@ -133,7 +133,7 @@ def lastevents
   # GET /public/distributions
   def distributions
     valid_http_methods :get
-    @distributions = Distribution.all
+    @distributions = Distribution.all_as_hash
 
     render "distributions/index"
   end

diff --git a/src/api/lib/opensuse/backend.rb b/src/api/lib/opensuse/backend.rb
@@ -247,6 +247,7 @@ def start_test_backend
           logger.debug line.strip
         end
         CONFIG['global_write_through'] = true
+        WebMock.disable_net_connect!(allow: CONFIG['source_host'])
         at_exit do
           logger.debug "kill #{@@backend.pid}"
           Process.kill "INT", @@backend.pid

diff --git a/src/api/test/functional/distributions_controller_test.rb b/src/api/test/functional/distributions_controller_test.rb
@@ -62,7 +62,11 @@ class DistributionsControllerTest < ActionController::IntegrationTest
     get "/distributions"
     assert_response :success
     assert_no_xml_tag :tag => "project", :content => "RemoteInstance:openSUSE:12.2"
+  end
 
+  test "remotes work" do
+    prepare_request_with_user "tom", "thunder"
+
     fake_distribution_body = File.open(Rails.root.join("test/fixtures/backend/distributions.xml")).read
 
     # using mocha has the disadvantage of not testing the complete function
@@ -87,6 +91,7 @@ class DistributionsControllerTest < ActionController::IntegrationTest
 
   end
 
+
   test "we survive remote instances timeouts" do
     stub_request(:get, "http://localhost:3200/distributions.xml").to_timeout
     get "/distributions/include_remotes"