Skip to content

A platform for community discussion. Free, open, simple.

DEV: Restore and update request/api specs (#39483)

Jarek Radosza8937704e06e
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 2619efdf0ca..c7d75c049db 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -316,7 +316,7 @@ RSpec.describe Admin::SiteSettingsController do
expect(SiteSetting.selectable_avatars).to eq([])
end
- xit "sanitizes integer values" do
+ it "sanitizes integer values" do
put "/admin/site_settings/suggested_topics.json", params: { suggested_topics: "1,000" }
expect(response.status).to eq(204)
diff --git a/spec/requests/api/backups_spec.rb b/spec/requests/api/backups_spec.rb
index f2561514960..8960d9a7b77 100644
--- a/spec/requests/api/backups_spec.rb
+++ b/spec/requests/api/backups_spec.rb
@@ -64,18 +64,14 @@ RSpec.describe "backups" do
expected_response_schema = load_spec_schema("success_ok_response")
schema expected_response_schema
- #BackupRestore.expects(:backup!).with(admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
- let(:params) { { "with_uploads" => false } }
+ before { BackupRestore.stubs(:backup!) }
- #it_behaves_like "a JSON endpoint", 200 do
- # let(:expected_response_schema) { expected_response_schema }
- # let(:expected_request_schema) { expected_request_schema }
- #end
+ let(:params) { { "with_uploads" => false } }
- # Skipping this test for now because mocking of BackupRestore isn't working for some reason.
- # Without mocking it spawns a background process which we don't want to happen in our tests.
- # This still allows the API docs to be generated for this endpoint.
- xit
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
end
end
end
diff --git a/spec/requests/api/schemas/json/upload_create_request.json b/spec/requests/api/schemas/json/upload_create_request.json
index e9349bcba06..9b8431110eb 100644
--- a/spec/requests/api/schemas/json/upload_create_request.json
+++ b/spec/requests/api/schemas/json/upload_create_request.json
@@ -1,7 +1,7 @@
{
"additionalProperties": false,
"properties": {
- "type": {
+ "upload_type": {
"type": "string",
"enum": [
"avatar",
@@ -25,6 +25,6 @@
}
},
"required": [
- "type"
+ "upload_type"
]
}
diff --git a/spec/requests/api/uploads_spec.rb b/spec/requests/api/uploads_spec.rb
index d2a8d72fdb5..09f750740cc 100644
--- a/spec/requests/api/uploads_spec.rb
+++ b/spec/requests/api/uploads_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe "uploads" do
parameter name: :params, in: :body, schema: expected_request_schema
let(:params) do
- { "type" => "avatar", "user_id" => admin.id, "synchronous" => true, "file" => logo }
+ { "upload_type" => "avatar", "user_id" => admin.id, "synchronous" => true, "file" => logo }
end
produces "application/json"
@@ -29,9 +29,16 @@ RSpec.describe "uploads" do
expected_response_schema = load_spec_schema("upload_create_response")
schema(expected_response_schema)
- # Skipping this test for now until https://github.com/rswag/rswag/issues/348
- # is resolved. This still allows the docs to be generated for this endpoint though.
- xit
+ # rswag's submit_request does not correctly serialize multipart/form-data
+ # from an `in: :body` parameter (see rswag/rswag#348), so we issue the
+ # request manually and validate only the response against the schema.
+ it "returns a valid response" do
+ post "/uploads.json", params: params
+ expect(response.status).to eq(200)
+
+ schemer = JSONSchemer.schema(expected_response_schema)
+ expect(schemer.valid?(JSON.parse(response.body))).to eq(true)
+ end
end
end
end