summaryrefslogtreecommitdiff
path: root/spec/integration/rust/cargo_spec.rb
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-10-06 15:46:42 +0000
committerCan Eldem <celdem@gitlab.com>2020-10-06 15:46:42 +0000
commit561d687c4753fb1ee8724d5681defa4e1ca74a6d (patch)
tree7d0439ecc4f48b8247fd0c645da728976779dee0 /spec/integration/rust/cargo_spec.rb
parent7fe70519010e24fa1d6735b108793987e8a24aa4 (diff)
parent20b6b06141803d9cb93713257c874ff10509fd52 (diff)
Merge branch 'composite-licenses' into 'master'v3.27.0
Parse composite license expressions See merge request gitlab-org/security-products/license-management!228
Diffstat (limited to 'spec/integration/rust/cargo_spec.rb')
-rw-r--r--spec/integration/rust/cargo_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/rust/cargo_spec.rb b/spec/integration/rust/cargo_spec.rb
index c8794f8..7b2b606 100644
--- a/spec/integration/rust/cargo_spec.rb
+++ b/spec/integration/rust/cargo_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe "cargo" do
expect(subject.dependency_names).to match_array(%w[libc time])
end
- specify { expect(subject.licenses_for('libc')).to match_array(['mit or apache-2.0']) }
+ specify { expect(subject.licenses_for('libc')).to match_array(['MIT', 'Apache-2.0']) }
specify { expect(subject.licenses_for('time')).to match_array(['Apache-2.0', 'MIT']) }
end
@@ -38,7 +38,7 @@ RSpec.describe "cargo" do
specify do
expect(subject).to match_schema
expect(subject.dependency_names).to match_array(['libc'])
- expect(subject.licenses_for('libc')).to match_array(['mit or apache-2.0'])
+ expect(subject.licenses_for('libc')).to match_array(['MIT', 'Apache-2.0'])
end
end