Fixed integration tests

Integration tests should target the v2.4 image. Moreover, we should be testing the 2.7.1 registry. Signed-off-by: Miquel Sabaté Solà <[email protected]>
SUSE · Jan 24, 2019 · 840f601 · 840f601
1 parent e960c96
commit 840f601
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/app/policies/namespace_policy.rb b/app/policies/namespace_policy.rb
@@ -56,8 +56,6 @@ def destroy?
     all_destroy?(force_non_global: true)
   end
 
-  alias delete? destroy?
-
   def update?
     raise Pundit::NotAuthorizedError, "must be logged in" unless user
     (user.admin? || (APP_CONFIG.enabled?("user_permission.manage_namespace") &&

diff --git a/lib/portus/http_helpers.rb b/lib/portus/http_helpers.rb
@@ -15,9 +15,10 @@ module HttpHelpers
     # Returns an URI object and a request object for the given path & method
     # pair.
     def get_request(path, method)
-      uri = URI.join(@base_url, path)
-      req = Net::HTTP.const_get(method.capitalize).new(uri)
-      [uri, req]
+      @uri    = URI.join(@base_url, path)
+      @method = method
+      req     = Net::HTTP.const_get(method.capitalize).new(@uri)
+      [@uri, req]
     end
 
     # This is the general method to perform an HTTP request to an endpoint
@@ -71,7 +72,8 @@ def safe_request(path, method = "get", request_auth_token = true)
     # response as given by the registry, and the params hash are extra arguments
     # that will be passed to the exception message.
     def handle_error(response, params = {})
-      str = "\nCode: #{response.code}\n"
+      str = "\nError on request: #{@method} #{@uri}\n" \
+            "Code: #{response.code}\n"
 
       # Add the errors as given by the registry.
       begin

diff --git a/lib/tasks/test/integration.rake b/lib/tasks/test/integration.rake
@@ -14,14 +14,13 @@ require "portus/test"
 # Images for the supported registry versions. These versions will be applied
 # through a cartesian product into the test matrix.
 SUPPORTED_REGISTRIES = [
-  "library/registry:2.5",
-  "library/registry:2.6"
+  "library/registry:2.7.1"
 ].freeze
 
 PRODUCTION = [
   {
-    background: "opensuse/portus:head",
-    portus:     "opensuse/portus:head"
+    background: "opensuse/portus:2.4",
+    portus:     "opensuse/portus:2.4"
   }
 ].freeze