From 2903d850cbfe27dc6f23b226b43e9364199636ab Mon Sep 17 00:00:00 2001 From: Jacob Michalskie Date: Fri, 8 Mar 2024 08:58:29 +0100 Subject: [PATCH 1/3] Move view_file into files controller --- src/api/app/components/diff_list_component.rb | 4 +- .../components/sourcediff_tab_component.rb | 4 +- .../webui/kiwi/images_controller.rb | 2 +- .../controllers/webui/package_controller.rb | 42 ----------------- .../webui/packages/files_controller.rb | 46 ++++++++++++++++++- .../webui/package/_breadcrumb_items.html.haml | 3 -- .../app/views/webui/package/_file.html.haml | 3 +- .../app/views/webui/package/rdiff.html.haml | 2 +- .../files/_breadcrumb_items.html.haml | 8 +++- .../views/webui/packages/files/show.html.haml | 30 ++++++++++++ .../packages/files/simple_show.html.haml | 7 +++ src/api/config/routes/webui_routes.rb | 5 +- .../webui/kiwi/images_controller_spec.rb | 24 +++++----- 13 files changed, 111 insertions(+), 69 deletions(-) create mode 100644 src/api/app/views/webui/packages/files/show.html.haml create mode 100644 src/api/app/views/webui/packages/files/simple_show.html.haml diff --git a/src/api/app/components/diff_list_component.rb b/src/api/app/components/diff_list_component.rb index 4a76bf1223e..ee9b2e5868b 100644 --- a/src/api/app/components/diff_list_component.rb +++ b/src/api/app/components/diff_list_component.rb @@ -32,13 +32,13 @@ def source_file(filename) return nil unless @source_package return nil unless @source_package.file_exists?(filename, { rev: @source_rev, expand: 1 }.compact) - package_view_file_path(@source_package.project, @source_package, filename, rev: @source_rev, expand: 1) + project_package_file_path(@source_package.project, @source_package, filename, rev: @source_rev, expand: 1) end def target_file(filename) return nil unless @target_package return nil unless @target_package.file_exists?(filename, expand: 1) - package_view_file_path(@target_package.project, @target_package, filename, expand: 1) + project_package_file_path(@target_package.project, @target_package, filename, expand: 1) end end diff --git a/src/api/app/components/sourcediff_tab_component.rb b/src/api/app/components/sourcediff_tab_component.rb index 6d87f9a3e56..f47e0d7cf22 100644 --- a/src/api/app/components/sourcediff_tab_component.rb +++ b/src/api/app/components/sourcediff_tab_component.rb @@ -19,7 +19,9 @@ def file_view_path(filename, sourcediff) return if sourcediff['files'][filename]['state'] == 'deleted' diff_params = diff_data(@action[:type], sourcediff) - package_view_file_path(diff_params.merge(filename: filename)) + diff_params[:project_name] = diff_params[:project] + diff_params[:package_name] = diff_params[:package] + project_package_file_path(diff_params.merge(filename: filename)) end def release_info diff --git a/src/api/app/controllers/webui/kiwi/images_controller.rb b/src/api/app/controllers/webui/kiwi/images_controller.rb index e30cf9cfa89..b1a1c7280d3 100644 --- a/src/api/app/controllers/webui/kiwi/images_controller.rb +++ b/src/api/app/controllers/webui/kiwi/images_controller.rb @@ -23,7 +23,7 @@ def import_from_package unless package.save errors = package.kiwi_image.nested_error_messages.merge(title: "Kiwi File '#{kiwi_file}' has errors:") - redirect_to package_view_file_path(project: package.project, package: package, filename: kiwi_file), error: errors + redirect_to project_package_file_path(project_name: package.project, package_name: package, filename: kiwi_file), error: errors return end end diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb index 8e5619cd698..8a5c48eedff 100644 --- a/src/api/app/controllers/webui/package_controller.rb +++ b/src/api/app/controllers/webui/package_controller.rb @@ -281,40 +281,6 @@ def trigger_services redirect_to package_show_path(@project, @package) end - def view_file - @filename = params[:filename] || params[:file] || '' - if binary_file?(@filename) # We don't want to display binary files - flash[:error] = "Unable to display binary file #{@filename}" - redirect_back(fallback_location: { action: :show, project: @project, package: @package }) - return - end - @rev = params[:rev] - @expand = params[:expand] - @addeditlink = false - if User.possibly_nobody.can_modify?(@package) && @rev.blank? && @package.scmsync.blank? - files = @package.dir_hash({ rev: @rev, expand: @expand }.compact).elements('entry') - files.each do |file| - if file['name'] == @filename - @addeditlink = editable_file?(@filename, file['size'].to_i) - break - end - end - end - begin - @file = @package.source_file(@filename, fetch_from_params(:rev, :expand)) - rescue Backend::NotFoundError - flash[:error] = "File not found: #{@filename}" - redirect_to action: :show, package: @package, project: @project - return - rescue Backend::Error => e - flash[:error] = "Error: #{e}" - redirect_back(fallback_location: { action: :show, project: @project, package: @package }) - return - end - - render(template: 'webui/package/simple_file_view') && return if @spider_bot - end - def abort_build authorize @package, :update? @@ -603,12 +569,4 @@ def get_diff(project, package, options = {}) end true end - - def fetch_from_params(*arr) - opts = {} - arr.each do |k| - opts[k] = params[k] if params[k].present? - end - opts - end end diff --git a/src/api/app/controllers/webui/packages/files_controller.rb b/src/api/app/controllers/webui/packages/files_controller.rb index e35efd078d6..ced1520b11e 100644 --- a/src/api/app/controllers/webui/packages/files_controller.rb +++ b/src/api/app/controllers/webui/packages/files_controller.rb @@ -1,10 +1,31 @@ module Webui module Packages class FilesController < Packages::MainController + include Webui::PackageHelper + before_action :set_project before_action :set_package - before_action :set_filename, only: %i[update destroy] - after_action :verify_authorized + before_action :set_filename, only: %i[show update destroy] + before_action :ensure_existence, only: :show + before_action :ensure_viewable, only: :show + before_action :set_file, only: :show + + after_action :verify_authorized, except: :show + + def show + @rev = params[:rev] + @expand = params[:expand] + @addeditlink = false + + if User.possibly_nobody.can_modify?(@package) && @rev.blank? && @package.scmsync.blank? + files = @package.dir_hash({ rev: @rev, expand: @expand }.compact).elements('entry') + if (file = files.find { |f| f['name'] == @filename }.presence) + @addeditlink = editable_file?(@filename, file['size'].to_i) + end + end + + render(template: 'webui/packages/files/simple_show') && return if @spider_bot + end def new authorize @package, :update? @@ -93,6 +114,27 @@ def destroy def set_filename @filename = params[:filename] end + + def ensure_existence + return if @package.file_exists?(@filename, params.slice(:rev, :expand).permit!.to_h) + + flash[:error] = "File not found: #{@filename}" + redirect_to package_show_path(project: @project, package: @package) + end + + def ensure_viewable + return unless binary_file?(@filename) # We don't want to display binary files + + flash[:error] = "Unable to display binary file #{@filename}" + redirect_back(fallback_location: package_show_path(project: @project, package: @package)) + end + + def set_file + @file = @package.source_file(@filename, params.slice(:rev, :expand).permit!.to_h) + rescue Backend::Error => e + flash[:error] = "Error: #{e}" + redirect_back(fallback_location: package_show_path(project: @project, package: @package)) + end end end end diff --git a/src/api/app/views/webui/package/_breadcrumb_items.html.haml b/src/api/app/views/webui/package/_breadcrumb_items.html.haml index bc9beb91526..5b0d32bad9c 100644 --- a/src/api/app/views/webui/package/_breadcrumb_items.html.haml +++ b/src/api/app/views/webui/package/_breadcrumb_items.html.haml @@ -25,6 +25,3 @@ = link_to 'Repository State', project_package_repository_binaries_path(@project, @package_name, @repository) %li.breadcrumb-item.active{ 'aria-current' => 'page' } Statistics - - if current_page?(package_view_file_path(@project, @package)) - %li.breadcrumb-item.active.text-word-break-all{ 'aria-current' => 'page' } - = truncate(@filename, length: 50) diff --git a/src/api/app/views/webui/package/_file.html.haml b/src/api/app/views/webui/package/_file.html.haml index d90ebcee541..b56c787b7cf 100644 --- a/src/api/app/views/webui/package/_file.html.haml +++ b/src/api/app/views/webui/package/_file.html.haml @@ -1,7 +1,8 @@ - can_be_removed = removable_file?(file_name: file['name'], package: package) && can_modify %tr{ id: "file-#{valid_xml_id(file['name'])}" } %td.text-word-break-all - - link_opts = { action: :view_file, project: project, package: package, filename: file['name'], expand: expand } + - link_opts = { action: :show, controller: 'webui/packages/files', project_name: project, + package_name: package, filename: file['name'], expand: expand } - unless is_current_rev - link_opts[:rev] = srcmd5 = link_to_if(viewable_file?(file['name'], file['size'].to_i), nbsp(file['name']), link_opts) diff --git a/src/api/app/views/webui/package/rdiff.html.haml b/src/api/app/views/webui/package/rdiff.html.haml index ff194f050e5..74c6d2b66e2 100644 --- a/src/api/app/views/webui/package/rdiff.html.haml +++ b/src/api/app/views/webui/package/rdiff.html.haml @@ -33,7 +33,7 @@ - revision = calculate_revision_on_state(@rev, @files[filename]['state']) .mb-2 = render partial: 'revision_diff_detail', - locals: { file_view_path: package_view_file_path(project: @project, package: @package, rev: revision, filename: filename), + locals: { file_view_path: project_package_file_path(project_name: @project, package_name: @package, rev: revision, filename: filename), filename: filename, file: @files[filename], index: index, diff --git a/src/api/app/views/webui/packages/files/_breadcrumb_items.html.haml b/src/api/app/views/webui/packages/files/_breadcrumb_items.html.haml index 57c9d7f3cd1..1df15eba8d7 100644 --- a/src/api/app/views/webui/packages/files/_breadcrumb_items.html.haml +++ b/src/api/app/views/webui/packages/files/_breadcrumb_items.html.haml @@ -1,3 +1,7 @@ = render partial: 'webui/package/breadcrumb_items' -%li.breadcrumb-item.active{ 'aria-current' => 'page' } - Add File +- if action_name == 'new' + %li.breadcrumb-item.active{ 'aria-current' => 'page' } + Add File +- if action_name == 'show' + %li.breadcrumb-item.active.text-word-break-all{ 'aria-current' => 'page' } + = truncate(@filename, length: 50) diff --git a/src/api/app/views/webui/packages/files/show.html.haml b/src/api/app/views/webui/packages/files/show.html.haml new file mode 100644 index 00000000000..45278afb151 --- /dev/null +++ b/src/api/app/views/webui/packages/files/show.html.haml @@ -0,0 +1,30 @@ +- @pagetitle = "File #{truncate(@filename, length: 50)} of Package #{truncate(@package.name, length: 50)}" +- content_for(:content_for_head, javascript_include_tag('webui/cm2/codemirror-file')) + +.card.mb-3 + = render partial: 'webui/package/tabs', locals: { project: @project, package: @package } + .card-body + %h3.text-word-break-all + File #{@filename} of Package #{@package} + - if @rev + (Revision #{@rev}) + - if @rev + %p + Currently displaying revision + %i= @rev + , + = link_to('Show latest', project: @project, package: @package, filename: @filename, expand: @expand) + + - if @addeditlink + - if @filename.ends_with?('.changes') + %p + %a.changes-link{ href: '#', onclick: 'addChangesEntryTemplate(); return false;', + data: { packagername: User.session!.realname, packageremail: User.session!.email } } + Insert changes entry template + + -# TODO: Provide a comments field through a callback + = render(partial: 'webui/shared/editor', locals: { text: @file, mode: guess_code_class(@filename), + save: { url: project_package_file_path(@project, @package, @filename), method: :put, + data: { project: @project.name, package: @package.name, submit: 'file', comment: '', filename: @filename, rev: @rev } } }) + - else + = render(partial: 'webui/shared/editor', locals: { text: @file, mode: guess_code_class(@filename), style: { read_only: true } }) diff --git a/src/api/app/views/webui/packages/files/simple_show.html.haml b/src/api/app/views/webui/packages/files/simple_show.html.haml new file mode 100644 index 00000000000..81ac54e3365 --- /dev/null +++ b/src/api/app/views/webui/packages/files/simple_show.html.haml @@ -0,0 +1,7 @@ +- @pagetitle = "File #{@filename} of Package #{@package}" + +.card.mb-3 + = render partial: 'webui/package/tabs', locals: { project: @project, package: @package } + .card-body + %h3= @pagetitle + %pre.border.border-dotted.bg-body-secondary.p-2.mb-0= force_utf8_and_transform_nonprintables(@file) diff --git a/src/api/config/routes/webui_routes.rb b/src/api/config/routes/webui_routes.rb index 67212250fe3..011afdc98ec 100644 --- a/src/api/config/routes/webui_routes.rb +++ b/src/api/config/routes/webui_routes.rb @@ -94,7 +94,8 @@ post 'package/save_person/:project/:package' => :save_person, constraints: cons, as: 'package_save_person' post 'package/save_group/:project/:package' => :save_group, constraints: cons, as: 'package_save_group' post 'package/remove_role/:project/:package' => :remove_role, constraints: cons, as: 'package_remove_role' - get 'package/view_file/:project/:package/(:filename)' => :view_file, constraints: cons, as: 'package_view_file' + # For backward compatibility + get 'package/view_file/:project/:package/:filename', to: redirect('/projects/%{project}/packages/%{package}/files/%{filename}'), constraints: cons defaults format: 'js' do post 'package/trigger_rebuild/:project/:package' => :trigger_rebuild, constraints: cons, as: 'package_trigger_rebuild' get 'package/abort_build/:project/:package' => :abort_build, constraints: cons, as: 'package_abort_build' @@ -281,7 +282,7 @@ resources :deletions, controller: 'webui/requests/deletions', only: %i[new create], constraints: cons resources :devel_project_changes, controller: 'webui/requests/devel_project_changes', only: %i[new create], constraints: cons resources :submissions, controller: 'webui/requests/submissions', only: %i[new create], constraints: cons - resources :files, controller: 'webui/packages/files', only: %i[new create update destroy], constraints: cons, param: :filename, format: false + resources :files, controller: 'webui/packages/files', only: %i[new create show update destroy], constraints: cons, param: :filename, format: false, defaults: { format: 'html' } put 'toggle_watched_item', controller: 'webui/watched_items', constraints: cons resource :badge, controller: 'webui/packages/badge', only: [:show], constraints: cons.merge(format: :svg) resources :repositories, only: [], param: :name do diff --git a/src/api/spec/controllers/webui/kiwi/images_controller_spec.rb b/src/api/spec/controllers/webui/kiwi/images_controller_spec.rb index e9e82f5aabe..1d7c75a420c 100644 --- a/src/api/spec/controllers/webui/kiwi/images_controller_spec.rb +++ b/src/api/spec/controllers/webui/kiwi/images_controller_spec.rb @@ -46,10 +46,10 @@ get :import_from_package, params: { package_id: package_with_kiwi_file.id } end - it 'redirect to package_view_file_path' do - expect(response).to redirect_to(package_view_file_path(project: package_with_kiwi_file.project, - package: package_with_kiwi_file, - filename: "#{package_with_kiwi_file.name}.kiwi")) + it 'redirect to project_package_file_path' do + expect(response).to redirect_to(project_package_file_path(project_name: package_with_kiwi_file.project, + package_name: package_with_kiwi_file, + filename: "#{package_with_kiwi_file.name}.kiwi")) end it { expect(flash[:error]).not_to be_nil } @@ -91,10 +91,10 @@ get :import_from_package, params: { package_id: package_with_kiwi_file.id } end - it 'redirect to package_view_file_path' do - expect(response).to redirect_to(package_view_file_path(project: package_with_kiwi_file.project, - package: package_with_kiwi_file, - filename: "#{package_with_kiwi_file.name}.kiwi")) + it 'redirect to project_package_file_path' do + expect(response).to redirect_to(project_package_file_path(project_name: package_with_kiwi_file.project, + package_name: package_with_kiwi_file, + filename: "#{package_with_kiwi_file.name}.kiwi")) end it { expect(flash[:error]).to eq(errors) } @@ -125,10 +125,10 @@ get :import_from_package, params: { package_id: package_with_kiwi_file.id } end - it 'redirect to package_view_file_path' do - expect(response).to redirect_to(package_view_file_path(project: package_with_kiwi_file.project, - package: package_with_kiwi_file, - filename: "#{package_with_kiwi_file.name}.kiwi")) + it 'redirect to project_package_file_path' do + expect(response).to redirect_to(project_package_file_path(project_name: package_with_kiwi_file.project, + package_name: package_with_kiwi_file, + filename: "#{package_with_kiwi_file.name}.kiwi")) end it { expect(flash[:error]).to match_array(errors) } From faf405645f2dbaab56601008b00a606a14cb5e81 Mon Sep 17 00:00:00 2001 From: Jacob Michalskie Date: Thu, 14 Mar 2024 14:31:30 +0100 Subject: [PATCH 2/3] Regenerate failing controller cassettes --- .../editing_an_existing_file.yml | 352 ++++++++---------- .../1_1_2_2_2.yml | 120 ++---- ...redirect_to_project_package_file_path.yml} | 119 ++---- .../with_the_same_type/1_1_2_4_1_2.yml | 119 ++---- ...redirect_to_project_package_file_path.yml} | 120 ++---- .../redirect_to_kiwi_image_show.yml | 167 ++++----- .../1_1_2_3_2_2.yml | 119 ++---- ...redirect_to_project_package_file_path.yml} | 119 ++---- .../modifies_an_existing_file/1_2_1_1_1.yml | 103 ++--- .../modifies_an_existing_file/1_2_1_1_2.yml | 107 ++---- .../modifies_an_existing_file/1_2_1_1_3.yml | 109 ++---- .../modifies_an_existing_file/1_2_2_1_1.yml | 47 +-- 12 files changed, 608 insertions(+), 993 deletions(-) rename src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/{redirect_to_package_view_file_path.yml => redirect_to_project_package_file_path.yml} (76%) rename src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/{redirect_to_package_view_file_path.yml => redirect_to_project_package_file_path.yml} (71%) rename src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/{redirect_to_package_view_file_path.yml => redirect_to_project_package_file_path.yml} (75%) diff --git a/src/api/spec/cassettes/Packages/editing_package_files/editing_an_existing_file.yml b/src/api/spec/cassettes/Packages/editing_package_files/editing_an_existing_file.yml index 9e701885482..8c725cd6ad3 100644 --- a/src/api/spec/cassettes/Packages/editing_package_files/editing_an_existing_file.yml +++ b/src/api/spec/cassettes/Packages/editing_package_files/editing_an_existing_file.yml @@ -39,16 +39,16 @@ http_interactions: - recorded_at: Fri, 24 Feb 2023 13:40:12 GMT + recorded_at: Thu, 14 Mar 2024 14:14:50 GMT - request: method: put - uri: http://backend:5352/source/home:package_test_user/test_package/_meta?user=user_38 + uri: http://backend:5352/source/home:package_test_user/test_package/_meta?user=user_29 body: encoding: UTF-8 string: | - The Glory and the Dream - Cumque qui modi facere. + Recalled to Life + Sit fuga beatae repellat. headers: Accept-Encoding: @@ -69,21 +69,21 @@ http_interactions: Connection: - close Content-Length: - - '168' + - '163' body: encoding: UTF-8 string: | - The Glory and the Dream - Cumque qui modi facere. + Recalled to Life + Sit fuga beatae repellat. - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:50 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/test_package/_config body: encoding: UTF-8 - string: Nihil eos quae. Neque quidem fugiat. Repudiandae provident sunt. + string: Non et temporibus. Dignissimos quas inventore. Odit nesciunt veritatis. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -103,25 +103,25 @@ http_interactions: Connection: - close Content-Length: - - '211' + - '207' body: encoding: UTF-8 string: | - - e1de79bd2d203c58b3c27578547db19e + + 9d8e8c9020cc0d03544805b466846f7b unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:50 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/test_package/somefile.txt body: encoding: UTF-8 - string: Illum nulla similique. Neque rerum adipisci. Itaque enim inventore. + string: Odit autem optio. Voluptates quas aspernatur. Occaecati assumenda qui. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -141,19 +141,19 @@ http_interactions: Connection: - close Content-Length: - - '211' + - '207' body: encoding: UTF-8 string: | - - 8adf60222178de7df75e2cc421d0cec9 + + 9fe4024b4b79ae9fec0dff2e7a78e569 unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:50 GMT - request: method: put uri: http://backend:5352/source/home:other_package_test_user/_meta?user=other_package_test_user @@ -193,16 +193,16 @@ http_interactions: - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:50 GMT - request: method: put - uri: http://backend:5352/source/home:other_package_test_user/branch_test_package/_meta?user=user_39 + uri: http://backend:5352/source/home:other_package_test_user/branch_test_package/_meta?user=user_30 body: encoding: UTF-8 string: | - Gone with the Wind - Perferendis rerum voluptas et. + Clouds of Witness + Est ea magnam quas. headers: Accept-Encoding: @@ -223,21 +223,21 @@ http_interactions: Connection: - close Content-Length: - - '183' + - '171' body: encoding: UTF-8 string: | - Gone with the Wind - Perferendis rerum voluptas et. + Clouds of Witness + Est ea magnam quas. - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:51 GMT - request: method: put uri: http://backend:5352/source/home:other_package_test_user/branch_test_package/_config body: encoding: UTF-8 - string: Tempore laborum quam. Error consequatur sint. Vitae recusandae expedita. + string: Officiis tempore veniam. Ut iste voluptatem. Non dolores eum. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -257,25 +257,25 @@ http_interactions: Connection: - close Content-Length: - - '209' + - '207' body: encoding: UTF-8 string: | - - 3ac6d25c1505057e47e7f6aafe0231e2 + + b9bd9e68f800fc623b52ad3cfd883d2a unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:51 GMT - request: method: put uri: http://backend:5352/source/home:other_package_test_user/branch_test_package/somefile.txt body: encoding: UTF-8 - string: Voluptatem quis officiis. Quam minima optio. At possimus ipsam. + string: Et alias voluptatum. Et natus harum. Nesciunt aut eum. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -295,19 +295,19 @@ http_interactions: Connection: - close Content-Length: - - '209' + - '207' body: encoding: UTF-8 string: | - - 5ff1d177d46ef4010213a73b8c24ccb0 + + fc600f624bb3a9b25337a39f688d48d6 unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:13 GMT + recorded_at: Thu, 14 Mar 2024 14:14:51 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/_meta?user=package_test_user @@ -315,8 +315,8 @@ http_interactions: encoding: UTF-8 string: | - Things Fall Apart - Et aut debitis atque. + Pale Kings and Princes + Corporis omnis fuga in. headers: Accept-Encoding: @@ -337,21 +337,21 @@ http_interactions: Connection: - close Content-Length: - - '170' + - '177' body: encoding: UTF-8 string: | - Things Fall Apart - Et aut debitis atque. + Pale Kings and Princes + Corporis omnis fuga in. - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/_config body: encoding: UTF-8 - string: Omnis nostrum esse. Ipsam reprehenderit et. Voluptatibus fugit voluptatem. + string: Inventore incidunt nisi. Illum et quisquam. Consequuntur id incidunt. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -375,21 +375,21 @@ http_interactions: body: encoding: UTF-8 string: | - - cb56987d197a04e3a1afddf78ee9af2b + + f23845ae99661d87f73476d04e7e3e02 unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/somefile.txt body: encoding: UTF-8 - string: Magni quia repellat. Quam expedita id. At inventore quia. + string: Perspiciatis iste et. Saepe similique illo. Ducimus alias quaerat. headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -409,19 +409,19 @@ http_interactions: Connection: - close Content-Length: - - '209' + - '207' body: encoding: UTF-8 string: | - - dde9c66b89590fc55d99999d060775e3 + + cde44510fa61be8412a6ba94a7c44866 unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package @@ -430,7 +430,7 @@ http_interactions: string: '' headers: X-Request-Id: - - 5fa45053-2abe-4aa0-bf09-32db3c075674 + - bece728f-65a9-4d5d-a3c4-c1ab0ed943d0 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -449,18 +449,18 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get - uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?expand=1&rev=10 + uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?expand=1&rev=8 body: encoding: US-ASCII string: '' @@ -483,24 +483,24 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get - uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/_history?deleted=0&meta=0&rev=10 + uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/_history?deleted=0&meta=0&rev=8 body: encoding: US-ASCII string: '' headers: X-Request-Id: - - 5fa45053-2abe-4aa0-bf09-32db3c075674 + - bece728f-65a9-4d5d-a3c4-c1ab0ed943d0 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -519,19 +519,19 @@ http_interactions: Connection: - close Content-Length: - - '215' + - '213' body: encoding: UTF-8 string: | - - dde9c66b89590fc55d99999d060775e3 + + cde44510fa61be8412a6ba94a7c44866 unknown - + unknown - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package @@ -540,7 +540,7 @@ http_interactions: string: '' headers: X-Request-Id: - - 5fa45053-2abe-4aa0-bf09-32db3c075674 + - bece728f-65a9-4d5d-a3c4-c1ab0ed943d0 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -559,15 +559,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package @@ -576,7 +576,7 @@ http_interactions: string: '' headers: X-Request-Id: - - 5fa45053-2abe-4aa0-bf09-32db3c075674 + - bece728f-65a9-4d5d-a3c4-c1ab0ed943d0 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -595,51 +595,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT -- request: - method: get - uri: http://backend:5352/source/home:package_test_user/file_edit_test_package - body: - encoding: US-ASCII - string: '' - headers: - X-Request-Id: - - 2acf8781-6359-452b-9ef7-0897ddc38ff0 - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '309' - body: - encoding: UTF-8 - string: | - - - - - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get uri: http://backend:5352/build/home:package_test_user/_result?lastbuild=1&locallink=1&multibuild=1&package=file_edit_test_package&view=status @@ -648,7 +612,7 @@ http_interactions: string: '' headers: X-Request-Id: - - 2acf8781-6359-452b-9ef7-0897ddc38ff0 + - e4ffb4eb-cc0b-4e15-98e3-e524134dec12 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -673,16 +637,16 @@ http_interactions: string: ' ' - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get - uri: http://backend:5352/source/home:package_test_user/file_edit_test_package + uri: http://backend:5352/build/home:package_test_user/_result?lastbuild=1&locallink=1&multibuild=1&package=file_edit_test_package&view=status body: encoding: US-ASCII string: '' headers: X-Request-Id: - - 052d6397-90da-4372-8c05-31f1fc73d27f + - 4563b52c-9ce3-44a9-bb9f-a28b0970144c Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -701,24 +665,22 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '55' body: encoding: UTF-8 - string: | - - - - - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + string: ' + +' + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get - uri: http://backend:5352/build/home:package_test_user/_result?lastbuild=1&locallink=1&multibuild=1&package=file_edit_test_package&view=status + uri: http://backend:5352/build/home:package_test_user/_result?package=file_edit_test_package&view=status body: encoding: US-ASCII string: '' headers: X-Request-Id: - - 052d6397-90da-4372-8c05-31f1fc73d27f + - e8998017-ca1c-493c-b4b8-ee02fa2980ce Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -743,16 +705,16 @@ http_interactions: string: ' ' - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get - uri: http://backend:5352/build/home:package_test_user/_result?package=file_edit_test_package&view=status + uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?expand=1 body: encoding: US-ASCII string: '' headers: X-Request-Id: - - 5b88fd73-7471-4647-a57d-3d7bf102c663 + - 9f3b09b1-80d9-47e2-8120-ec253c3c0a73 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -771,13 +733,15 @@ http_interactions: Connection: - close Content-Length: - - '55' + - '307' body: encoding: UTF-8 - string: ' - -' - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + string: | + + + + + recorded_at: Thu, 14 Mar 2024 14:14:52 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?expand=1 @@ -785,6 +749,8 @@ http_interactions: encoding: US-ASCII string: '' headers: + X-Request-Id: + - 9f3b09b1-80d9-47e2-8120-ec253c3c0a73 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -803,15 +769,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/somefile.txt?expand=1 @@ -833,24 +799,24 @@ http_interactions: Content-Type: - application/octet-stream Content-Length: - - '57' + - '66' Cache-Control: - no-cache Connection: - close body: encoding: UTF-8 - string: Magni quia repellat. Quam expedita id. At inventore quia. - recorded_at: Fri, 24 Feb 2023 13:40:14 GMT + string: Perspiciatis iste et. Saepe similique illo. Ducimus alias quaerat. + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get - uri: http://backend:5352/source/home:package_test_user/file_edit_test_package + uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?expand=1 body: encoding: US-ASCII string: '' headers: X-Request-Id: - - d4d506ac-ab8b-404c-944e-0ae1f45d8bb2 + - 9f3b09b1-80d9-47e2-8120-ec253c3c0a73 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -869,15 +835,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/somefile.txt?comment=&user=package_test_user @@ -886,7 +852,7 @@ http_interactions: string: added some new text headers: X-Request-Id: - - d4d506ac-ab8b-404c-944e-0ae1f45d8bb2 + - 9fd921eb-f7ea-43cd-9ccc-8e2e41cbf345 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -905,19 +871,19 @@ http_interactions: Connection: - close Content-Length: - - '219' + - '217' body: encoding: UTF-8 string: | - - cb56987d197a04e3a1afddf78ee9af2b + + 407c00b2666015520b0d8e8e42a0c4cb unknown - + package_test_user - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: put uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/_meta?user=package_test_user @@ -925,8 +891,8 @@ http_interactions: encoding: UTF-8 string: | - Things Fall Apart - Et aut debitis atque. + Pale Kings and Princes + Corporis omnis fuga in. headers: Accept-Encoding: @@ -947,15 +913,15 @@ http_interactions: Connection: - close Content-Length: - - '170' + - '177' body: encoding: UTF-8 string: | - Things Fall Apart - Et aut debitis atque. + Pale Kings and Princes + Corporis omnis fuga in. - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package @@ -981,15 +947,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?view=info @@ -998,7 +964,7 @@ http_interactions: string: '' headers: X-Request-Id: - - d4d506ac-ab8b-404c-944e-0ae1f45d8bb2 + - 9fd921eb-f7ea-43cd-9ccc-8e2e41cbf345 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -1017,14 +983,14 @@ http_interactions: Connection: - close Content-Length: - - '242' + - '240' body: encoding: UTF-8 string: | - + bad build configuration, no build type defined or detected - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package @@ -1033,7 +999,7 @@ http_interactions: string: '' headers: X-Request-Id: - - d4d506ac-ab8b-404c-944e-0ae1f45d8bb2 + - 9fd921eb-f7ea-43cd-9ccc-8e2e41cbf345 Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 Accept: @@ -1052,15 +1018,15 @@ http_interactions: Connection: - close Content-Length: - - '309' + - '307' body: encoding: UTF-8 string: | - - - + + + - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: post uri: http://backend:5352/source/home:package_test_user/file_edit_test_package?cmd=diff&linkrev=base&onlyissues=1&orev=0&view=xml @@ -1088,18 +1054,18 @@ http_interactions: Connection: - close Content-Length: - - '351' + - '350' body: encoding: UTF-8 string: | - + - + - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT - request: method: get uri: http://backend:5352/source/home:package_test_user/file_edit_test_package/somefile.txt @@ -1129,5 +1095,5 @@ http_interactions: body: encoding: UTF-8 string: added some new text - recorded_at: Fri, 24 Feb 2023 13:40:15 GMT -recorded_with: VCR 6.1.0 + recorded_at: Thu, 14 Mar 2024 14:14:53 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/1_1_2_2_2.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/1_1_2_2_2.yml index 39d0d1ffad5..d5146758dd7 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/1_1_2_2_2.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/1_1_2_2_2.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - Behold the Man + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,61 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '103' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>Behold the Man + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:10 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Soluta deleniti et consequatur. Quibusdam est a dolorem delectus sit - placeat. Aut vel illo culpa. Earum similique sed repellat. Qui quod et quae - quos. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:10 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - Blue Remembered Earth - Et voluptatem voluptas quidem. - + + If I Forget Thee Jerusalem + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -103,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '181' + - '115' body: encoding: UTF-8 string: | - - Blue Remembered Earth - Et voluptatem voluptas quidem. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:10 GMT + + If I Forget Thee Jerusalem + + + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Blue Remembered Earth - Et voluptatem voluptas quidem. + Stranger in a Strange Land + Quibusdam id amet est. headers: Accept-Encoding: @@ -142,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '181' + - '178' body: encoding: UTF-8 string: | - Blue Remembered Earth - Et voluptatem voluptas quidem. + Stranger in a Strange Land + Quibusdam id amet est. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:10 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -223,16 +187,15 @@ http_interactions: body: encoding: UTF-8 string: | - + 6ccfa0805f62f6fba78db7bc8b4082ba unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -258,15 +221,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -338,8 +300,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -365,13 +326,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_package_view_file_path.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_project_package_file_path.yml similarity index 76% rename from src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_package_view_file_path.yml rename to src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_project_package_file_path.yml index 19e81e70dab..564b74d6ec8 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_package_view_file_path.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/that_is_an_invalid_kiwi_file/redirect_to_project_package_file_path.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - The Sun Also Rises + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,60 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '107' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>The Sun Also Rises + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Assumenda atque repudiandae. Deleniti voluptate eveniet aut odio ad - asperiores. Tenetur natus recusandae architecto molestiae voluptas. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - Endless Night - Distinctio voluptatum ea fugit aut delectus mollitia. - + + Butter In a Lordly Dish + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -102,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '196' + - '112' body: encoding: UTF-8 string: | - - Endless Night - Distinctio voluptatum ea fugit aut delectus mollitia. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + + Butter In a Lordly Dish + + + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Endless Night - Distinctio voluptatum ea fugit aut delectus mollitia. + No Longer at Ease + Praesentium quae consequatur quaerat. headers: Accept-Encoding: @@ -141,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '196' + - '184' body: encoding: UTF-8 string: | - Endless Night - Distinctio voluptatum ea fugit aut delectus mollitia. + No Longer at Ease + Praesentium quae consequatur quaerat. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -222,16 +187,15 @@ http_interactions: body: encoding: UTF-8 string: | - + 6ccfa0805f62f6fba78db7bc8b4082ba unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -257,15 +221,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -337,8 +300,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -364,13 +326,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/1_1_2_4_1_2.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/1_1_2_4_1_2.yml index c1b065f2329..c38bad9825a 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/1_1_2_4_1_2.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/1_1_2_4_1_2.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - Jacob Have I Loved + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,60 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '107' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>Jacob Have I Loved + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Rerum iusto itaque odio. Temporibus sunt amet voluptas numquam. Rerum - reprehenderit voluptate rerum laboriosam ut quo. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - Infinite Jest - Est a quia qui tempora laborum velit unde. - + + Tirra Lirra by the River + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -102,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '185' + - '113' body: encoding: UTF-8 string: | - - Infinite Jest - Est a quia qui tempora laborum velit unde. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + + Tirra Lirra by the River + + + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Infinite Jest - Est a quia qui tempora laborum velit unde. + Let Us Now Praise Famous Men + Alias quos laudantium sed. headers: Accept-Encoding: @@ -141,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '185' + - '184' body: encoding: UTF-8 string: | - Infinite Jest - Est a quia qui tempora laborum velit unde. + Let Us Now Praise Famous Men + Alias quos laudantium sed. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -207,16 +172,15 @@ http_interactions: body: encoding: UTF-8 string: | - + a51602dae6fc2e8322ebff0f3408ff85 unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -242,15 +206,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -307,8 +270,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -334,13 +296,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_package_view_file_path.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_project_package_file_path.yml similarity index 71% rename from src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_package_view_file_path.yml rename to src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_project_package_file_path.yml index 1370cff9fed..fe4f96b1be0 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_package_view_file_path.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_multiple_package_groups/with_the_same_type/redirect_to_project_package_file_path.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - Rosemary Sutcliff + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,61 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '106' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>Rosemary Sutcliff + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Reprehenderit cumque laborum. Consequatur suscipit libero. Necessitatibus - perferendis aut ducimus enim dolores. Sint dolores voluptas molestias maiores - nisi perferendis. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - The Needle's Eye - Ut quia possimus cum tempora rerum non recusandae deleniti. - + + All the King's Men + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -103,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '107' body: encoding: UTF-8 string: | - - The Needle's Eye - Ut quia possimus cum tempora rerum non recusandae deleniti. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + + All the King's Men + + + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - The Needle's Eye - Ut quia possimus cum tempora rerum non recusandae deleniti. + If Not Now, When? + Explicabo dolorum ratione inventore. headers: Accept-Encoding: @@ -142,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '183' body: encoding: UTF-8 string: | - The Needle's Eye - Ut quia possimus cum tempora rerum non recusandae deleniti. + If Not Now, When? + Explicabo dolorum ratione inventore. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -208,16 +172,15 @@ http_interactions: body: encoding: UTF-8 string: | - + a51602dae6fc2e8322ebff0f3408ff85 unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:11 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -243,15 +206,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -308,8 +270,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -335,13 +296,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:49 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository/redirect_to_kiwi_image_show.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository/redirect_to_kiwi_image_show.yml index 672e6804d3f..1954365cff7 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository/redirect_to_kiwi_image_show.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository/redirect_to_kiwi_image_show.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - Infinite Jest + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,61 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '102' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>Infinite Jest + + + - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Nesciunt officia est et. Sit et repellat perspiciatis nisi cupiditate - qui eligendi. Sed aut maxime tenetur asperiores. Ut reprehenderit quisquam - molestiae dolorum aut. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - Many Waters - Sit aut beatae quasi provident dignissimos. - + + The Violent Bear It Away + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -103,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '178' + - '113' body: encoding: UTF-8 string: | - - Many Waters - Sit aut beatae quasi provident dignissimos. - - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + + The Violent Bear It Away + + + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Many Waters - Sit aut beatae quasi provident dignissimos. + To Sail Beyond the Sunset + Unde eaque sit repellat. headers: Accept-Encoding: @@ -142,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '178' + - '173' body: encoding: UTF-8 string: | - Many Waters - Sit aut beatae quasi provident dignissimos. + To Sail Beyond the Sunset + Unde eaque sit repellat. - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/package_with_a_kiwi_file.kiwi @@ -225,13 +189,12 @@ http_interactions: b7a6e8f3d8eb6f018faca857359eed87 unknown - + unknown - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file @@ -257,15 +220,14 @@ http_interactions: Connection: - close Content-Length: - - '235' + - '234' body: encoding: UTF-8 string: | - + - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/package_with_a_kiwi_file.kiwi @@ -336,8 +298,7 @@ http_interactions: 2.0.0 - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file @@ -363,24 +324,61 @@ http_interactions: Connection: - close Content-Length: - - '235' + - '234' body: encoding: UTF-8 string: | - + - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT +- request: + method: put + uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta?user=tom + body: + encoding: UTF-8 + string: | + + To Sail Beyond the Sunset + Unde eaque sit repellat. + + headers: + Accept-Encoding: + - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 + Accept: + - "*/*" + User-Agent: + - Ruby + response: + status: + code: 200 + message: OK + headers: + Content-Type: + - text/xml + Cache-Control: + - no-cache + Connection: + - close + Content-Length: + - '173' + body: + encoding: UTF-8 + string: | + + To Sail Beyond the Sunset + Unde eaque sit repellat. + + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/package_with_a_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Many Waters - Sit aut beatae quasi provident dignissimos. + To Sail Beyond the Sunset + Unde eaque sit repellat. headers: Accept-Encoding: @@ -401,14 +399,13 @@ http_interactions: Connection: - close Content-Length: - - '178' + - '173' body: encoding: UTF-8 string: | - Many Waters - Sit aut beatae quasi provident dignissimos. + To Sail Beyond the Sunset + Unde eaque sit repellat. - http_version: - recorded_at: Mon, 19 Mar 2018 15:50:04 GMT -recorded_with: VCR 4.0.0 + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/1_1_2_3_2_2.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/1_1_2_3_2_2.yml index 31252fcb27f..5301baaba56 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/1_1_2_3_2_2.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/1_1_2_3_2_2.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - The Wives of Bath + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,60 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '106' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>The Wives of Bath + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Fugit vero modi molestiae. Voluptatem debitis quia eos. Enim debitis - qui voluptas. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - The Yellow Meads of Asphodel - Laboriosam sapiente in eveniet dolores incidunt magnam. - + + The Golden Apples of the Sun + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -102,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '213' + - '117' body: encoding: UTF-8 string: | - - The Yellow Meads of Asphodel - Laboriosam sapiente in eveniet dolores incidunt magnam. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + + The Golden Apples of the Sun + + + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - The Yellow Meads of Asphodel - Laboriosam sapiente in eveniet dolores incidunt magnam. + An Evil Cradling + Officia odio minima fuga. headers: Accept-Encoding: @@ -141,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '213' + - '171' body: encoding: UTF-8 string: | - The Yellow Meads of Asphodel - Laboriosam sapiente in eveniet dolores incidunt magnam. + An Evil Cradling + Officia odio minima fuga. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:12 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -220,16 +185,15 @@ http_interactions: body: encoding: UTF-8 string: | - + febd44ad0e6a0c4271b0197ea7a125e9 unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -255,15 +219,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -333,8 +296,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -360,13 +322,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:47 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_package_view_file_path.yml b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_project_package_file_path.yml similarity index 75% rename from src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_package_view_file_path.yml rename to src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_project_package_file_path.yml index 36faa5f7c04..18d8f2a297d 100644 --- a/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_package_view_file_path.yml +++ b/src/api/spec/cassettes/Webui_Kiwi_ImagesController/GET_import_from_package/with_a_kiwi_file/with_source_path/with_obsrepository_and_others/redirect_to_project_package_file_path.yml @@ -2,13 +2,14 @@ http_interactions: - request: method: put - uri: http://backend:5352/source/fake_project/_meta + uri: http://backend:5352/source/home:tom/_meta?user=tom body: encoding: UTF-8 string: | - - To a God Unknown + + <description/> + <person userid="tom" role="maintainer"/> </project> headers: Accept-Encoding: @@ -29,60 +30,26 @@ http_interactions: Connection: - close Content-Length: - - '105' + - '128' body: encoding: UTF-8 string: | - <project name="fake_project"> - <title>To a God Unknown + + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/_config - body: - encoding: UTF-8 - string: Cumque ut adipisci distinctio quibusdam et ea. Sed officia autem non. - Iure numquam quam nihil et dicta voluptate. - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '21' - body: - encoding: UTF-8 - string: ' - -' - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT -- request: - method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=_nobody_ + uri: http://backend:5352/source/fake_project/_meta?user=tom body: encoding: UTF-8 string: | - - Nectar in a Sieve - Est rerum consequatur cupiditate esse consequatur ut nisi. - + + A Handful of Dust + + headers: Accept-Encoding: - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 @@ -102,25 +69,24 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '106' body: encoding: UTF-8 string: | - - Nectar in a Sieve - Est rerum consequatur cupiditate esse consequatur ut nisi. - - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + + A Handful of Dust + + + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put - uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta + uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/_meta?user=tom body: encoding: UTF-8 string: | - Nectar in a Sieve - Est rerum consequatur cupiditate esse consequatur ut nisi. + Antic Hay + Sit repudiandae nulla est. headers: Accept-Encoding: @@ -141,16 +107,15 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '165' body: encoding: UTF-8 string: | - Nectar in a Sieve - Est rerum consequatur cupiditate esse consequatur ut nisi. + Antic Hay + Sit repudiandae nulla est. - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: put uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -220,16 +185,15 @@ http_interactions: body: encoding: UTF-8 string: | - + febd44ad0e6a0c4271b0197ea7a125e9 unknown - + unknown - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -255,15 +219,14 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file/package_with_invalid_kiwi_file.kiwi @@ -333,8 +296,7 @@ http_interactions: - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT - request: method: get uri: http://backend:5352/source/fake_project/package_with_invalid_kiwi_file @@ -360,13 +322,12 @@ http_interactions: Connection: - close Content-Length: - - '247' + - '246' body: encoding: UTF-8 string: | - - + + - http_version: - recorded_at: Mon, 06 Nov 2017 12:06:13 GMT -recorded_with: VCR 3.0.3 + recorded_at: Thu, 14 Mar 2024 13:14:48 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_1.yml b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_1.yml index 75f4d1cdca2..9c3fd8086a6 100644 --- a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_1.yml +++ b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_1.yml @@ -39,7 +39,7 @@ http_interactions: - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -47,8 +47,8 @@ http_interactions: encoding: UTF-8 string: | - A Time of Gifts - Dignissimos corrupti soluta nobis. + The Monkey's Raincoat + Tempora officia eaque rerum. headers: Accept-Encoding: @@ -74,41 +74,10 @@ http_interactions: encoding: UTF-8 string: | - A Time of Gifts - Dignissimos corrupti soluta nobis. + The Monkey's Raincoat + Tempora officia eaque rerum. - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT -- request: - method: get - uri: http://backend:5352/source/home:tom/my_package - body: - encoding: US-ASCII - string: '' - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '308' - body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEwIiB2cmV2PSIxMCIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/newly_created_file?comment=&user=tom @@ -134,19 +103,19 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '203' body: encoding: UTF-8 string: | - - 2506dbaca20cd9fec80d30d7a0c509ac + + 72f8aafad574c385e4092a1bc5ce7f06 unknown - + tom - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -154,8 +123,8 @@ http_interactions: encoding: UTF-8 string: | - A Time of Gifts - Dignissimos corrupti soluta nobis. + The Monkey's Raincoat + Tempora officia eaque rerum. headers: Accept-Encoding: @@ -181,10 +150,10 @@ http_interactions: encoding: UTF-8 string: | - A Time of Gifts - Dignissimos corrupti soluta nobis. + The Monkey's Raincoat + Tempora officia eaque rerum. - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -210,12 +179,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjExIiB2cmV2PSIxMSIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package?view=info @@ -241,14 +212,14 @@ http_interactions: Connection: - close Content-Length: - - '230' + - '228' body: encoding: UTF-8 string: | - + bad build configuration, no build type defined or detected - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -274,12 +245,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjExIiB2cmV2PSIxMSIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: post uri: http://backend:5352/source/home:tom/my_package?cmd=diff&linkrev=base&onlyissues=1&orev=0&view=xml @@ -307,16 +280,16 @@ http_interactions: Connection: - close Content-Length: - - '299' + - '298' body: encoding: UTF-8 string: | - + - + - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT -recorded_with: VCR 6.1.0 + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_2.yml b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_2.yml index 52ad3f6f33b..cefaaf6806d 100644 --- a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_2.yml +++ b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_2.yml @@ -39,7 +39,7 @@ http_interactions: - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -47,8 +47,8 @@ http_interactions: encoding: UTF-8 string: | - Cover Her Face - Facere non consequatur quo. + A Handful of Dust + Vero quaerat consectetur consequatur. headers: Accept-Encoding: @@ -69,46 +69,15 @@ http_interactions: Connection: - close Content-Length: - - '147' + - '160' body: encoding: UTF-8 string: | - Cover Her Face - Facere non consequatur quo. + A Handful of Dust + Vero quaerat consectetur consequatur. - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT -- request: - method: get - uri: http://backend:5352/source/home:tom/my_package - body: - encoding: US-ASCII - string: '' - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '306' - body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjkiIHZyZXY9IjkiIHNyY21kNT0iMjUwNmRiYWNhMjBjZDlmZWM4MGQzMGQ3YTBjNTA5YWMiPgogIDxlbnRyeSBuYW1lPSJuZXdseV9jcmVhdGVkX2ZpbGUiIG1kNT0iZDQxZDhjZDk4ZjAwYjIwNGU5ODAwOTk4ZWNmODQyN2UiIHNpemU9IjAiIG10aW1lPSIxNjc0ODI2NjMyIi8+CiAgPGVudHJ5IG5hbWU9IuWtpuS5oOaAu+e7kyIgbWQ1PSI2YmExNjdkNzJlOWNjNjAxMDhhNzU2N2NkYWVjNzIwZiIgc2l6ZT0iOTc3IiBtdGltZT0iMTY3NDgyOTE1NyIvPgo8L2RpcmVjdG9yeT4K - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/newly_created_file?comment=&user=tom @@ -134,19 +103,19 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '203' body: encoding: UTF-8 string: | - - 2506dbaca20cd9fec80d30d7a0c509ac + + 72f8aafad574c385e4092a1bc5ce7f06 unknown - + tom - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -154,8 +123,8 @@ http_interactions: encoding: UTF-8 string: | - Cover Her Face - Facere non consequatur quo. + A Handful of Dust + Vero quaerat consectetur consequatur. headers: Accept-Encoding: @@ -176,15 +145,15 @@ http_interactions: Connection: - close Content-Length: - - '147' + - '160' body: encoding: UTF-8 string: | - Cover Her Face - Facere non consequatur quo. + A Handful of Dust + Vero quaerat consectetur consequatur. - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -210,12 +179,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEwIiB2cmV2PSIxMCIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package?view=info @@ -241,14 +212,14 @@ http_interactions: Connection: - close Content-Length: - - '230' + - '228' body: encoding: UTF-8 string: | - + bad build configuration, no build type defined or detected - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -274,12 +245,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEwIiB2cmV2PSIxMCIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: post uri: http://backend:5352/source/home:tom/my_package?cmd=diff&linkrev=base&onlyissues=1&orev=0&view=xml @@ -307,16 +280,16 @@ http_interactions: Connection: - close Content-Length: - - '299' + - '298' body: encoding: UTF-8 string: | - + - + - recorded_at: Tue, 14 Feb 2023 14:12:03 GMT -recorded_with: VCR 6.1.0 + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_3.yml b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_3.yml index 4d47292689f..830b5fed306 100644 --- a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_3.yml +++ b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_ajax_request/modifies_an_existing_file/1_2_1_1_3.yml @@ -39,7 +39,7 @@ http_interactions: - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -47,8 +47,8 @@ http_interactions: encoding: UTF-8 string: | - Vile Bodies - Aut culpa eos dolorem. + The Moving Toyshop + Laudantium sit quia consequuntur. headers: Accept-Encoding: @@ -69,46 +69,15 @@ http_interactions: Connection: - close Content-Length: - - '139' + - '157' body: encoding: UTF-8 string: | - Vile Bodies - Aut culpa eos dolorem. + The Moving Toyshop + Laudantium sit quia consequuntur. - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT -- request: - method: get - uri: http://backend:5352/source/home:tom/my_package - body: - encoding: US-ASCII - string: '' - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '308' - body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjExIiB2cmV2PSIxMSIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/newly_created_file?comment=&user=tom @@ -134,19 +103,19 @@ http_interactions: Connection: - close Content-Length: - - '205' + - '203' body: encoding: UTF-8 string: | - - 2506dbaca20cd9fec80d30d7a0c509ac + + 72f8aafad574c385e4092a1bc5ce7f06 unknown - + tom - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -154,8 +123,8 @@ http_interactions: encoding: UTF-8 string: | - Vile Bodies - Aut culpa eos dolorem. + The Moving Toyshop + Laudantium sit quia consequuntur. headers: Accept-Encoding: @@ -176,15 +145,15 @@ http_interactions: Connection: - close Content-Length: - - '139' + - '157' body: encoding: UTF-8 string: | - Vile Bodies - Aut culpa eos dolorem. + The Moving Toyshop + Laudantium sit quia consequuntur. - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -210,12 +179,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEyIiB2cmV2PSIxMiIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package?view=info @@ -241,14 +212,14 @@ http_interactions: Connection: - close Content-Length: - - '230' + - '228' body: encoding: UTF-8 string: | - + bad build configuration, no build type defined or detected - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package @@ -274,12 +245,14 @@ http_interactions: Connection: - close Content-Length: - - '308' + - '206' body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEyIiB2cmV2PSIxMiIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + encoding: UTF-8 + string: | + + + + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: post uri: http://backend:5352/source/home:tom/my_package?cmd=diff&linkrev=base&onlyissues=1&orev=0&view=xml @@ -307,18 +280,18 @@ http_interactions: Connection: - close Content-Length: - - '299' + - '298' body: encoding: UTF-8 string: | - + - + - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT + recorded_at: Thu, 14 Mar 2024 13:19:37 GMT - request: method: get uri: http://backend:5352/source/home:tom/my_package/newly_created_file @@ -348,5 +321,5 @@ http_interactions: body: encoding: UTF-8 string: '' - recorded_at: Tue, 14 Feb 2023 14:12:04 GMT -recorded_with: VCR 6.1.0 + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT +recorded_with: VCR 6.2.0 diff --git a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_non-ajax_request/modifies_an_existing_file/1_2_2_1_1.yml b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_non-ajax_request/modifies_an_existing_file/1_2_2_1_1.yml index 88b62c5c8e8..445456f52c7 100644 --- a/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_non-ajax_request/modifies_an_existing_file/1_2_2_1_1.yml +++ b/src/api/spec/cassettes/Webui_Packages_FilesController/POST_update/as_non-ajax_request/modifies_an_existing_file/1_2_2_1_1.yml @@ -39,7 +39,7 @@ http_interactions: - recorded_at: Tue, 14 Feb 2023 14:12:05 GMT + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT - request: method: put uri: http://backend:5352/source/home:tom/my_package/_meta?user=tom @@ -47,8 +47,8 @@ http_interactions: encoding: UTF-8 string: | - For a Breath I Tarry - Mollitia tenetur voluptates aut. + This Lime Tree Bower + Alias fugit aliquid consequuntur. headers: Accept-Encoding: @@ -69,44 +69,13 @@ http_interactions: Connection: - close Content-Length: - - '158' + - '159' body: encoding: UTF-8 string: | - For a Breath I Tarry - Mollitia tenetur voluptates aut. + This Lime Tree Bower + Alias fugit aliquid consequuntur. - recorded_at: Tue, 14 Feb 2023 14:12:05 GMT -- request: - method: get - uri: http://backend:5352/source/home:tom/my_package - body: - encoding: US-ASCII - string: '' - headers: - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - User-Agent: - - Ruby - response: - status: - code: 200 - message: OK - headers: - Content-Type: - - text/xml - Cache-Control: - - no-cache - Connection: - - close - Content-Length: - - '308' - body: - encoding: ASCII-8BIT - string: !binary |- - PGRpcmVjdG9yeSBuYW1lPSJteV9wYWNrYWdlIiByZXY9IjEyIiB2cmV2PSIxMiIgc3JjbWQ1PSIyNTA2ZGJhY2EyMGNkOWZlYzgwZDMwZDdhMGM1MDlhYyI+CiAgPGVudHJ5IG5hbWU9Im5ld2x5X2NyZWF0ZWRfZmlsZSIgbWQ1PSJkNDFkOGNkOThmMDBiMjA0ZTk4MDA5OThlY2Y4NDI3ZSIgc2l6ZT0iMCIgbXRpbWU9IjE2NzQ4MjY2MzIiLz4KICA8ZW50cnkgbmFtZT0i5a2m5Lmg5oC757uTIiBtZDU9IjZiYTE2N2Q3MmU5Y2M2MDEwOGE3NTY3Y2RhZWM3MjBmIiBzaXplPSI5NzciIG10aW1lPSIxNjc0ODI5MTU3Ii8+CjwvZGlyZWN0b3J5Pgo= - recorded_at: Tue, 14 Feb 2023 14:12:05 GMT -recorded_with: VCR 6.1.0 + recorded_at: Thu, 14 Mar 2024 13:19:38 GMT +recorded_with: VCR 6.2.0 From 417a5547a571064483dbe1070db37f882e7b6422 Mon Sep 17 00:00:00 2001 From: Jacob Michalskie Date: Thu, 14 Mar 2024 16:01:38 +0100 Subject: [PATCH 3/3] Ignore files controller length in rubocop todo --- src/api/.rubocop_todo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/.rubocop_todo.yml b/src/api/.rubocop_todo.yml index f7ea035cb4d..e0d50ea1e1b 100644 --- a/src/api/.rubocop_todo.yml +++ b/src/api/.rubocop_todo.yml @@ -194,7 +194,7 @@ Metrics/BlockNesting: - 'app/models/bs_request_action.rb' - 'lib/xpath_engine.rb' -# Offense count: 85 +# Offense count: 86 # Configuration parameters: CountComments, Max, CountAsOne. Metrics/ClassLength: Exclude: @@ -209,6 +209,7 @@ Metrics/ClassLength: - 'app/controllers/webui/kiwi/images_controller.rb' - 'app/controllers/webui/package_controller.rb' - 'app/controllers/webui/packages/build_log_controller.rb' + - 'app/controllers/webui/packages/files_controller.rb' - 'app/controllers/webui/patchinfo_controller.rb' - 'app/controllers/webui/project_controller.rb' - 'app/controllers/webui/packages/binaries_controller.rb'