Skip to content

Commit

Permalink
Merge pull request #12232 from openSUSE/depfu/update/srcapi/flipper-0…
Browse files Browse the repository at this point in the history
….24.0

[src/api] Update flipper: 0.23.1 → 0.24.0 (major)
  • Loading branch information
Dany Marcoux committed Mar 22, 2022
2 parents 54999a0 + 1aca8cf commit 27c1f00
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions src/api/Gemfile.lock
Expand Up @@ -187,13 +187,13 @@ GEM
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5)
flipper (0.23.1)
flipper-active_record (0.23.1)
flipper (0.24.0)
flipper-active_record (0.24.0)
activerecord (>= 4.2, < 8)
flipper (~> 0.23.1)
flipper-ui (0.23.0)
flipper (~> 0.24.0)
flipper-ui (0.24.0)
erubi (>= 1.0.0, < 2.0.0)
flipper (~> 0.23.0)
flipper (~> 0.24.0)
rack (>= 1.4, < 3)
rack-protection (>= 1.5.3, < 2.2.0)
sanitize (< 7)
Expand Down Expand Up @@ -282,7 +282,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2021.1115)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
mini_portile2 (2.7.1)
minitest (5.15.0)
minitest-ci (3.4.0)
minitest (>= 5.0.6)
Expand Down Expand Up @@ -315,8 +315,8 @@ GEM
next_rails (1.0.4)
colorize (>= 0.8.1)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
racc (~> 1.4)
octokit (4.22.0)
faraday (>= 0.9)
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/kiwi/image/xml_builder.rb
Expand Up @@ -6,7 +6,7 @@ def initialize(image)
end

def build
doc = Nokogiri::XML::DocumentFragment.parse(@image.kiwi_body)
doc = Nokogiri::XML::Document.parse(@image.kiwi_body)
image = doc.at_css('image')

return nil unless image && image.first_element_child
Expand Down
12 changes: 6 additions & 6 deletions src/api/spec/models/kiwi/image_spec.rb
Expand Up @@ -221,7 +221,7 @@
kiwi_image.save
end

subject { Nokogiri::XML::DocumentFragment.parse(kiwi_image.to_xml) }
subject { Nokogiri::XML::Document.parse(kiwi_image.to_xml) }

it { expect(subject.errors).to be_empty }
it { expect(subject.xpath('.//image').length).to be(1) }
Expand Down Expand Up @@ -273,7 +273,7 @@
logout
end

subject { Nokogiri::XML::DocumentFragment.parse(kiwi_image.to_xml) }
subject { Nokogiri::XML::Document.parse(kiwi_image.to_xml) }

it 'returns the xml for the kiwi image correctly' do
expect(subject.errors).to be_empty
Expand Down Expand Up @@ -315,7 +315,7 @@
let(:package) { create(:package) }
let(:kiwi_image) { Kiwi::Image.build_from_xml(kiwi_xml, 'some_md5') }

subject { Nokogiri::XML::DocumentFragment.parse(kiwi_image.to_xml) }
subject { Nokogiri::XML::Document.parse(kiwi_image.to_xml) }

before do
allow(package).to receive(:kiwi_image_file).and_return('config.kiwi')
Expand All @@ -335,7 +335,7 @@
let(:package) { create(:package) }
let(:kiwi_image) { Kiwi::Image.build_from_xml(Kiwi::Image::DEFAULT_KIWI_BODY, 'some_md5') }

subject { Nokogiri::XML::DocumentFragment.parse(kiwi_image.to_xml) }
subject { Nokogiri::XML::Document.parse(kiwi_image.to_xml) }

before do
allow(package).to receive(:kiwi_image_file).and_return('config.kiwi')
Expand All @@ -347,8 +347,8 @@
kiwi_image.save
end

it { expect(subject.children[2].children[5].name).to eq('packages') }
it { expect(subject.children[2].children[7].name).to eq('repository') }
it { expect(subject.children[0].children[5].name).to eq('packages') }
it { expect(subject.children[0].children[7].name).to eq('repository') }
end
end

Expand Down
Binary file removed src/api/vendor/cache/flipper-0.23.1.gem
Binary file not shown.
Binary file added src/api/vendor/cache/flipper-0.24.0.gem
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/api/vendor/cache/mini_portile2-2.6.1.gem
Binary file not shown.
Binary file added src/api/vendor/cache/mini_portile2-2.7.1.gem
Binary file not shown.
Binary file not shown.

0 comments on commit 27c1f00

Please sign in to comment.