From d221c4aa84c3f4457836023de742f4e922a59ce5 Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Mon, 17 Aug 2020 17:29:53 +0300 Subject: Fix failed specs --- spec/fixtures/expected/python/2/pip/v2.0.json | 14 +++++++------- spec/fixtures/expected/python/2/pip/v2.1.json | 14 +++++++------- spec/fixtures/expected/python/pipenv/v2.0.json | 9 ++++----- spec/fixtures/expected/python/pipenv/v2.1.json | 8 ++++---- 4 files changed, 22 insertions(+), 23 deletions(-) (limited to 'spec/fixtures/expected/python') diff --git a/spec/fixtures/expected/python/2/pip/v2.0.json b/spec/fixtures/expected/python/2/pip/v2.0.json index 8ed6ee7..5515387 100644 --- a/spec/fixtures/expected/python/2/pip/v2.0.json +++ b/spec/fixtures/expected/python/2/pip/v2.0.json @@ -2,9 +2,9 @@ "version": "2.0", "licenses": [ { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause", + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses", "count": 4 }, { @@ -47,7 +47,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -80,7 +80,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -91,7 +91,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -113,7 +113,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/2/pip/v2.1.json b/spec/fixtures/expected/python/2/pip/v2.1.json index 3203679..36d625d 100644 --- a/spec/fixtures/expected/python/2/pip/v2.1.json +++ b/spec/fixtures/expected/python/2/pip/v2.1.json @@ -7,9 +7,9 @@ "url": "https://opensource.org/licenses/BSD-3-Clause" }, { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause" + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" }, { "id": "MIT", @@ -39,7 +39,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -66,7 +66,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -75,7 +75,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -93,7 +93,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/pipenv/v2.0.json b/spec/fixtures/expected/python/pipenv/v2.0.json index ba4d529..c41d970 100644 --- a/spec/fixtures/expected/python/pipenv/v2.0.json +++ b/spec/fixtures/expected/python/pipenv/v2.0.json @@ -8,10 +8,9 @@ "count": 1 }, { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause", - "count": 1 + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" }, { "id": "MIT", @@ -35,7 +34,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json index 30161e1..9c58d29 100644 --- a/spec/fixtures/expected/python/pipenv/v2.1.json +++ b/spec/fixtures/expected/python/pipenv/v2.1.json @@ -7,9 +7,9 @@ "url": "https://opensource.org/licenses/Apache-2.0" }, { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause" + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" }, { "id": "MIT", @@ -29,7 +29,7 @@ "package_manager": "pip", "path": "Pipfile.lock", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { -- cgit v1.2.3 From 4510deb87ee0acb985ebeb7478cae5909741776e Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Mon, 17 Aug 2020 19:12:34 +0300 Subject: Fix failed python specs --- spec/fixtures/expected/python/2/pip/v2.1.json | 10 +++++----- spec/fixtures/expected/python/3/pip/v2.0.json | 15 +++++++-------- spec/fixtures/expected/python/3/pip/v2.1.json | 18 +++++++++--------- spec/fixtures/expected/python/pipenv/v2.1.json | 10 +++++----- spec/integration/python/pip_spec.rb | 2 +- 5 files changed, 27 insertions(+), 28 deletions(-) (limited to 'spec/fixtures/expected/python') diff --git a/spec/fixtures/expected/python/2/pip/v2.1.json b/spec/fixtures/expected/python/2/pip/v2.1.json index 36d625d..05492d6 100644 --- a/spec/fixtures/expected/python/2/pip/v2.1.json +++ b/spec/fixtures/expected/python/2/pip/v2.1.json @@ -6,11 +6,6 @@ "name": "BSD 3-Clause \"New\" or \"Revised\" License", "url": "https://opensource.org/licenses/BSD-3-Clause" }, - { - "id": "bsd", - "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" - }, { "id": "MIT", "name": "MIT License", @@ -26,6 +21,11 @@ "name": "Python License 2.0", "url": "https://opensource.org/licenses/Python-2.0" }, + { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, { "id": "copyright (c) 2015, julien fache", "name": "Copyright (c) 2015, Julien Fache", diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json index b5c23ae..f4f3e1c 100644 --- a/spec/fixtures/expected/python/3/pip/v2.0.json +++ b/spec/fixtures/expected/python/3/pip/v2.0.json @@ -2,10 +2,9 @@ "version": "2.0", "licenses": [ { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause", - "count": 4 + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" }, { "id": "MIT", @@ -53,7 +52,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -86,7 +85,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -97,7 +96,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -119,7 +118,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/3/pip/v2.1.json b/spec/fixtures/expected/python/3/pip/v2.1.json index 787b800..a23b401 100644 --- a/spec/fixtures/expected/python/3/pip/v2.1.json +++ b/spec/fixtures/expected/python/3/pip/v2.1.json @@ -11,11 +11,6 @@ "name": "BSD 3-Clause \"New\" or \"Revised\" License", "url": "https://opensource.org/licenses/BSD-3-Clause" }, - { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause" - }, { "id": "MIT", "name": "MIT License", @@ -31,6 +26,11 @@ "name": "Python License 2.0", "url": "https://opensource.org/licenses/Python-2.0" }, + { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, { "id": "copyright (c) 2015, julien fache", "name": "Copyright (c) 2015, Julien Fache", @@ -44,7 +44,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -71,7 +71,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -80,7 +80,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -98,7 +98,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json index 9c58d29..9e64c02 100644 --- a/spec/fixtures/expected/python/pipenv/v2.1.json +++ b/spec/fixtures/expected/python/pipenv/v2.1.json @@ -6,16 +6,16 @@ "name": "Apache License 2.0", "url": "https://opensource.org/licenses/Apache-2.0" }, - { - "id": "bsd", - "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" - }, { "id": "MIT", "name": "MIT License", "url": "https://opensource.org/licenses/MIT" }, + { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, { "id": "public domain, python, 2-clause bsd, gpl 3 (see copying.txt)", "name": "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)", diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb index 86cdc2b..7aec470 100644 --- a/spec/integration/python/pip_spec.rb +++ b/spec/integration/python/pip_spec.rb @@ -47,7 +47,7 @@ RSpec.describe "pip" do end context 'with BSD licenses dependencies' do - let(:requirements) { %w[webencodings idna click EasyProcess].join("\n") } + let(:requirements) { %w[webencodings idna click EasyProcess PyVirtualDisplay].join("\n") } it 'finds proper versions of BSD license' do runner.add_file('requirements.txt', requirements) -- cgit v1.2.3 From ba0af496f034416bb7a9988f3b7c6be35ef6206c Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Tue, 18 Aug 2020 16:35:39 +0300 Subject: Fix failed tests --- spec/fixtures/expected/java/maven/v2.0.json | 3 ++- spec/fixtures/expected/java/maven/v2.1.json | 10 +++++----- spec/fixtures/expected/python/pipenv/v2.0.json | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'spec/fixtures/expected/python') diff --git a/spec/fixtures/expected/java/maven/v2.0.json b/spec/fixtures/expected/java/maven/v2.0.json index aeced14..8840ee1 100644 --- a/spec/fixtures/expected/java/maven/v2.0.json +++ b/spec/fixtures/expected/java/maven/v2.0.json @@ -22,7 +22,8 @@ { "id": "bsd", "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" + "url": "http://en.wikipedia.org/wiki/BSD_licenses", + "count": 1 }, { "id": "LGPL-2.1", diff --git a/spec/fixtures/expected/java/maven/v2.1.json b/spec/fixtures/expected/java/maven/v2.1.json index 9d03db0..fea817f 100644 --- a/spec/fixtures/expected/java/maven/v2.1.json +++ b/spec/fixtures/expected/java/maven/v2.1.json @@ -6,11 +6,6 @@ "name": "Apache License 2.0", "url": "https://opensource.org/licenses/Apache-2.0" }, - { - "id": "bsd", - "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" - }, { "id": "LGPL-2.1", "name": "GNU Lesser General Public License v2.1 only", @@ -26,6 +21,11 @@ "name": "Mozilla Public License 2.0", "url": "https://opensource.org/licenses/MPL-2.0" }, + { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, { "id": "cddl + gplv2 with classpath exception", "name": "CDDL + GPLv2 with classpath exception", diff --git a/spec/fixtures/expected/python/pipenv/v2.0.json b/spec/fixtures/expected/python/pipenv/v2.0.json index c41d970..59913c2 100644 --- a/spec/fixtures/expected/python/pipenv/v2.0.json +++ b/spec/fixtures/expected/python/pipenv/v2.0.json @@ -10,7 +10,8 @@ { "id": "bsd", "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" + "url": "http://en.wikipedia.org/wiki/BSD_licenses", + "count": 1 }, { "id": "MIT", -- cgit v1.2.3 From df9129ee5ce3fe0ce060e828ca75f9219b3923d7 Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Wed, 19 Aug 2020 18:14:50 +0300 Subject: Fix test issues --- spec/fixtures/expected/java/gradle/v2.0.json | 3 ++- spec/fixtures/expected/java/gradle/v2.1.json | 10 +++++----- spec/fixtures/expected/python/3/pip/v2.0.json | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'spec/fixtures/expected/python') diff --git a/spec/fixtures/expected/java/gradle/v2.0.json b/spec/fixtures/expected/java/gradle/v2.0.json index b210fb0..8592aaa 100644 --- a/spec/fixtures/expected/java/gradle/v2.0.json +++ b/spec/fixtures/expected/java/gradle/v2.0.json @@ -22,7 +22,8 @@ { "id": "bsd", "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" + "url": "http://en.wikipedia.org/wiki/BSD_licenses", + "count": 1 }, { "id": "LGPL-2.1", diff --git a/spec/fixtures/expected/java/gradle/v2.1.json b/spec/fixtures/expected/java/gradle/v2.1.json index c4e4fa2..4b3dff5 100644 --- a/spec/fixtures/expected/java/gradle/v2.1.json +++ b/spec/fixtures/expected/java/gradle/v2.1.json @@ -6,11 +6,6 @@ "name": "Apache License 2.0", "url": "https://opensource.org/licenses/Apache-2.0" }, - { - "id": "bsd", - "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" - }, { "id": "LGPL-2.1", "name": "GNU Lesser General Public License v2.1 only", @@ -26,6 +21,11 @@ "name": "Mozilla Public License 2.0", "url": "https://opensource.org/licenses/MPL-2.0" }, + { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, { "id": "cddl + gplv2 with classpath exception", "name": "CDDL + GPLv2 with classpath exception", diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json index f4f3e1c..ad2a588 100644 --- a/spec/fixtures/expected/python/3/pip/v2.0.json +++ b/spec/fixtures/expected/python/3/pip/v2.0.json @@ -4,7 +4,8 @@ { "id": "bsd", "name": "BSD", - "url": "http://en.wikipedia.org/wiki/BSD_licenses" + "url": "http://en.wikipedia.org/wiki/BSD_licenses", + "count": 1 }, { "id": "MIT", -- cgit v1.2.3 From 418ee0d18d9bcc00a0746dc05579c31fa21f90be Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Thu, 20 Aug 2020 19:32:42 +0300 Subject: Fix test fixture --- spec/fixtures/expected/python/3/pip/v2.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/fixtures/expected/python') diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json index ad2a588..49c7328 100644 --- a/spec/fixtures/expected/python/3/pip/v2.0.json +++ b/spec/fixtures/expected/python/3/pip/v2.0.json @@ -5,7 +5,7 @@ "id": "bsd", "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses", - "count": 1 + "count": 4 }, { "id": "MIT", -- cgit v1.2.3