summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab/qa.yml18
-rw-r--r--Dockerfile1
-rw-r--r--spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json (renamed from spec/fixtures/expected/csharp-nuget-dotnetcore-v1.json)0
-rw-r--r--spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json (renamed from spec/fixtures/expected/csharp-nuget-dotnetcore-v1.1.json)0
-rw-r--r--spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json (renamed from spec/fixtures/expected/csharp-nuget-dotnetcore-v2.json)0
-rw-r--r--spec/integration/dotnet/nuget_spec.rb4
6 files changed, 3 insertions, 20 deletions
diff --git a/.gitlab/qa.yml b/.gitlab/qa.yml
index 0549956..5a05ed3 100644
--- a/.gitlab/qa.yml
+++ b/.gitlab/qa.yml
@@ -89,21 +89,3 @@ QA:python3-pipenv-v2:
variables:
LM_REPORT_VERSION: 2
QA_RESULTS: python-pipenv-v2
-
-QA:dotnet:
- extends: .QA
- variables:
- QA_PROJECT: csharp-nuget-dotnetcore
- QA_REF: master
-
-QA:dotnet-v1-1:
- extends: QA:dotnet
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: csharp-nuget-dotnetcore-v1.1
-
-QA:dotnet-v2:
- extends: QA:dotnet
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: csharp-nuget-dotnetcore-v2
diff --git a/Dockerfile b/Dockerfile
index fc61b85..80bc7bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,5 @@ RUN apt-get update -q \
FROM ${TOOLS_IMAGE}
ENV LM_HOME=/opt/license-management
COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/
-COPY test /test
COPY run.sh /
ENTRYPOINT ["/run.sh"]
diff --git a/spec/fixtures/expected/csharp-nuget-dotnetcore-v1.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json
index 94ac683..94ac683 100644
--- a/spec/fixtures/expected/csharp-nuget-dotnetcore-v1.json
+++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.0.json
diff --git a/spec/fixtures/expected/csharp-nuget-dotnetcore-v1.1.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json
index 826c02c..826c02c 100644
--- a/spec/fixtures/expected/csharp-nuget-dotnetcore-v1.1.json
+++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v1.1.json
diff --git a/spec/fixtures/expected/csharp-nuget-dotnetcore-v2.json b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json
index 920f7de..920f7de 100644
--- a/spec/fixtures/expected/csharp-nuget-dotnetcore-v2.json
+++ b/spec/fixtures/expected/csharp/nuget-dotnetcore/v2.0.json
diff --git a/spec/integration/dotnet/nuget_spec.rb b/spec/integration/dotnet/nuget_spec.rb
index 1d0ecfc..3dce774 100644
--- a/spec/integration/dotnet/nuget_spec.rb
+++ b/spec/integration/dotnet/nuget_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
-RSpec.describe ".NET Framework" do
+RSpec.describe "nuget" do
+ include_examples "each report version", "csharp", "nuget-dotnetcore"
+
context "when a project has a nuget packages.config file in the root" do
let(:packages_config) do
<<-XML