diff --git a/app/controllers/api/projects/remixes_controller.rb b/app/controllers/api/projects/remixes_controller.rb index 91e054fb..1115c69b 100644 --- a/app/controllers/api/projects/remixes_controller.rb +++ b/app/controllers/api/projects/remixes_controller.rb @@ -47,7 +47,7 @@ def remix_params :project_type, :locale, :user_id, - image_list: [], + images: [], components: %i[id name extension content index]) end end diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 3ebf1ee8..302cb0e0 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -107,7 +107,7 @@ def base_params components: %i[id name extension content index default] }, parent: {}, - image_list: [] + images: [] ) end diff --git a/app/views/api/projects/images.json.jbuilder b/app/views/api/projects/images.json.jbuilder index 37ad9f48..2d39800f 100644 --- a/app/views/api/projects/images.json.jbuilder +++ b/app/views/api/projects/images.json.jbuilder @@ -2,7 +2,7 @@ json.call(@project) -json.image_list @project.images do |image| +json.images @project.images do |image| json.filename image.filename json.url rails_blob_url(image) end diff --git a/app/views/api/projects/show.json.jbuilder b/app/views/api/projects/show.json.jbuilder index 7ff4b103..a995bc05 100644 --- a/app/views/api/projects/show.json.jbuilder +++ b/app/views/api/projects/show.json.jbuilder @@ -26,7 +26,7 @@ json.components( :content ) -json.image_list(@project.images) do |image| +json.images(@project.images) do |image| json.filename(image.filename) json.url(rails_blob_url(image)) end diff --git a/spec/requests/projects/images_spec.rb b/spec/requests/projects/images_spec.rb index 481caf28..a4c7399c 100644 --- a/spec/requests/projects/images_spec.rb +++ b/spec/requests/projects/images_spec.rb @@ -8,7 +8,7 @@ let(:params) { { images: [fixture_file_upload(image_filename, 'image/png')] } } let(:expected_json) do { - image_list: [ + images: [ { filename: image_filename, url: rails_blob_url(project.images[0]) diff --git a/spec/requests/projects/show_spec.rb b/spec/requests/projects/show_spec.rb index 782cc829..3d453d87 100644 --- a/spec/requests/projects/show_spec.rb +++ b/spec/requests/projects/show_spec.rb @@ -26,7 +26,7 @@ user_id: project.user_id, instructions: project.instructions, components: [], - image_list: [], + images: [], videos: [], audio: [] }.to_json @@ -72,7 +72,7 @@ identifier: teacher_project.identifier }, components: [], - image_list: [], + images: [], videos: [], audio: [], user_name: 'Joe Bloggs', @@ -101,7 +101,7 @@ locale: another_project.locale, user_id: another_project.user_id, components: [], - image_list: [], + images: [], videos: [], audio: [] }.to_json @@ -132,7 +132,7 @@ user_id: starter_project.user_id, instructions: nil, components: [], - image_list: [], + images: [], videos: [], audio: [] }.to_json @@ -176,7 +176,7 @@ name: project.name, user_id: project.user_id, components: [], - image_list: [], + images: [], videos: [], audio: [] }.to_json