[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/inqlude] spec: Put test manifests in own sub directory
From: Cornelius Schumacher <schumacher () kde ! org>
Date: 2016-07-23 7:38:22
Message-ID: E1bQrVu-0004Ay-Pz () code ! kde ! org
[Download RAW message or body]
Git commit 11e2dc74075e4632bb6f76f846694ca7412aa4af by Cornelius Schumacher.
Committed on 02/07/2016 at 06:18.
Pushed by cschumac into branch 'master'.
Put test manifests in own sub directory
R +0 -0 spec/data/manifests/awesomelib/awesomelib.2013-09-08.manifest [from: \
spec/data/awesomelib/awesomelib.2013-09-08.manifest - 100% similarity] R +0 -0 \
spec/data/manifests/bleedingedge/bleedingedge.2012-01-01.manifest [from: \
spec/data/bleedingedge/bleedingedge.2012-01-01.manifest - 100% similarity] R +0 \
-0 spec/data/manifests/commercial/commercial.manifest [from: \
spec/data/commercial/commercial.manifest - 100% similarity] R +0 -0 \
spec/data/manifests/newlib/newlib.manifest [from: spec/data/newlib/newlib.manifest - \
100% similarity] R +0 -0 \
spec/data/manifests/proprietarylib/proprietarylib.2013-12-22.manifest [from: \
spec/data/proprietarylib/proprietarylib.2013-12-22.manifest - 100% similarity] M +1 \
-3 spec/integration/cli_general_spec.rb M +2 -2 \
spec/integration/cli_list_spec.rb M +5 -5 spec/integration/cli_verify_spec.rb
M +2 -2 spec/integration/cli_view_spec.rb
M +12 -12 spec/unit/creator_spec.rb
M +11 -11 spec/unit/kde_frameworks_release_spec.rb
M +18 -18 spec/unit/manifest_handler_spec.rb
M +1 -3 spec/unit/spec_helper.rb
http://commits.kde.org/websites/inqlude/11e2dc74075e4632bb6f76f846694ca7412aa4af
diff --git a/spec/data/awesomelib/awesomelib.2013-09-08.manifest \
b/spec/data/manifests/awesomelib/awesomelib.2013-09-08.manifest similarity index 100%
rename from spec/data/awesomelib/awesomelib.2013-09-08.manifest
rename to spec/data/manifests/awesomelib/awesomelib.2013-09-08.manifest
diff --git a/spec/data/bleedingedge/bleedingedge.2012-01-01.manifest \
b/spec/data/manifests/bleedingedge/bleedingedge.2012-01-01.manifest similarity index \
100% rename from spec/data/bleedingedge/bleedingedge.2012-01-01.manifest
rename to spec/data/manifests/bleedingedge/bleedingedge.2012-01-01.manifest
diff --git a/spec/data/commercial/commercial.manifest \
b/spec/data/manifests/commercial/commercial.manifest similarity index 100%
rename from spec/data/commercial/commercial.manifest
rename to spec/data/manifests/commercial/commercial.manifest
diff --git a/spec/data/newlib/newlib.manifest \
b/spec/data/manifests/newlib/newlib.manifest similarity index 100%
rename from spec/data/newlib/newlib.manifest
rename to spec/data/manifests/newlib/newlib.manifest
diff --git a/spec/data/proprietarylib/proprietarylib.2013-12-22.manifest \
b/spec/data/manifests/proprietarylib/proprietarylib.2013-12-22.manifest similarity \
index 100% rename from spec/data/proprietarylib/proprietarylib.2013-12-22.manifest
rename to spec/data/manifests/proprietarylib/proprietarylib.2013-12-22.manifest
diff --git a/spec/integration/cli_general_spec.rb \
b/spec/integration/cli_general_spec.rb index 590ff96..7fd6cc1 100644
--- a/spec/integration/cli_general_spec.rb
+++ b/spec/integration/cli_general_spec.rb
@@ -22,9 +22,7 @@ describe "Command line interface" do
use_given_filesystem
it "recognizes --offline option" do
- dir = given_directory do
- given_directory_from_data("awesomelib")
- end
+ dir = given_directory_from_data("manifests")
# This doesn't make much sense to a user, but that's what it is right now.
# It will go away when we switched to GLI
diff --git a/spec/integration/cli_list_spec.rb b/spec/integration/cli_list_spec.rb
index b223fb4..3d08edd 100644
--- a/spec/integration/cli_list_spec.rb
+++ b/spec/integration/cli_list_spec.rb
@@ -11,8 +11,8 @@ describe "Command line interface" do
it "lists libraries" do
dir = given_directory do
- given_directory_from_data("awesomelib")
- given_directory_from_data("newlib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
+ given_directory_from_data("newlib", from: "manifests/newlib")
end
result = run_command(args: ["list", "--remote", "--offline",
diff --git a/spec/integration/cli_verify_spec.rb \
b/spec/integration/cli_verify_spec.rb index 0962bae..cc5ceda 100644
--- a/spec/integration/cli_verify_spec.rb
+++ b/spec/integration/cli_verify_spec.rb
@@ -10,7 +10,7 @@ describe "Command line interface" do
describe "verify" do
it "verifies single manifest" do
dir = given_directory do
- given_directory_from_data("awesomelib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
end
result = run_command(args: ["verify",
@@ -20,8 +20,8 @@ describe "Command line interface" do
it "verifies all manifests" do
dir = given_directory do
- given_directory_from_data("awesomelib")
- given_directory_from_data("newlib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
+ given_directory_from_data("newlib", from: "manifests/newlib")
end
result = run_command(args: ["verify", "--offline", "--manifest_dir=#{dir}"])
@@ -36,7 +36,7 @@ EOT
it "verifies all manifests with syntax error" do
dir = given_directory do
- given_directory_from_data("awesomelib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
given_directory("newlib") do
given_dummy_file("newlib.manifest")
end
@@ -48,7 +48,7 @@ EOT
it "verifies all manifests with schema error" do
dir = given_directory do
- given_directory_from_data("awesomelib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
given_directory_from_data("broken")
end
diff --git a/spec/integration/cli_view_spec.rb b/spec/integration/cli_view_spec.rb
index 942528c..c9f5cb7 100644
--- a/spec/integration/cli_view_spec.rb
+++ b/spec/integration/cli_view_spec.rb
@@ -10,8 +10,8 @@ describe "Command line interface" do
describe "view" do
it "generates view" do
dir = given_directory do
- given_directory_from_data("awesomelib")
- given_directory_from_data("newlib")
+ given_directory_from_data("awesomelib", from: "manifests/awesomelib")
+ given_directory_from_data("newlib", from: "manifests/newlib")
end
output_dir = given_directory
diff --git a/spec/unit/creator_spec.rb b/spec/unit/creator_spec.rb
index 0209218..abe1e6b 100644
--- a/spec/unit/creator_spec.rb
+++ b/spec/unit/creator_spec.rb
@@ -3,12 +3,12 @@ require File.expand_path('../spec_helper', __FILE__)
describe Creator do
include GivenFilesystemSpecHelpers
-
+
use_given_filesystem
let(:settings) do
s = Settings.new
- s.manifest_path = File.expand_path('spec/data/')
+ s.manifest_path = File.expand_path('spec/data/manifests')
s.offline = true
s
end
@@ -25,12 +25,12 @@ describe Creator do
settings.manifest_path = given_directory do
given_directory "awesomelib" do
manifest_filename = given_file "awesomelib.2013-09-08.manifest",
- :from => "awesomelib/awesomelib.2013-09-08.manifest"
+ :from => "manifests/awesomelib/awesomelib.2013-09-08.manifest"
end
end
manifest_filename = File.join( settings.manifest_path, "awesomelib",
"awesomelib.2013-10-01.manifest" )
-
+
c = Creator.new settings, "awesomelib"
expect( File.exists?(manifest_filename) ).to be false
@@ -61,9 +61,9 @@ describe Creator do
c = Creator.new settings, "newawesomelib"
expect(File.exists?(manifest_filename)).to be false
-
+
c.create "edge", "2013-09-01"
-
+
expect(File.exists?(manifest_filename)).to be true
m = Manifest.parse_file(manifest_filename)
@@ -82,19 +82,19 @@ describe Creator do
c = Creator.new settings, "newawesomelib"
expect(File.exists?(manifest_filename)).to be false
-
+
c.create_generic
-
+
expect(File.exists?(manifest_filename)).to be true
end
-
+
describe "#create_dir" do
before(:each) do
@settings = Settings.new
@settings.manifest_path = given_directory
end
-
+
it "creates dir" do
c = Creator.new( @settings, "one" )
c.create_dir()
@@ -103,7 +103,7 @@ describe Creator do
expect( File.directory? File.join( @settings.manifest_path, "one" ) )
.to be true
end
-
+
it "uses existing dir" do
c = Creator.new( @settings, "one" )
c.create_dir()
@@ -114,5 +114,5 @@ describe Creator do
.to be true
end
end
-
+
end
diff --git a/spec/unit/kde_frameworks_release_spec.rb \
b/spec/unit/kde_frameworks_release_spec.rb index b5b9a15..2fb6870 100644
--- a/spec/unit/kde_frameworks_release_spec.rb
+++ b/spec/unit/kde_frameworks_release_spec.rb
@@ -1,11 +1,11 @@
require File.expand_path('../spec_helper', __FILE__)
describe KdeFrameworksRelease do
-
+
include GivenFilesystemSpecHelpers
use_given_filesystem
-
+
context "given KDE generic manifests" do
before(:each) do
@manifest_dir = given_directory do
@@ -16,31 +16,31 @@ describe KdeFrameworksRelease do
given_file("kservice.manifest", :from => "kservice-generic.manifest")
end
given_directory("newlib") do
- given_file("newlib.manifest", :from => "newlib/newlib.manifest")
+ given_file("newlib.manifest", :from => "manifests/newlib/newlib.manifest")
end
end
-
+
s = Settings.new
s.manifest_path = @manifest_dir
s.offline = true
@manifest_handler = ManifestHandler.new s
end
-
+
it "reads generic manifests" do
k = KdeFrameworksRelease.new @manifest_handler
k.read_generic_manifests
-
+
expect( k.generic_manifests.count ).to eq 2
expect( k.generic_manifests[0].name ).to eq "karchive"
expect( k.generic_manifests[1].name ).to eq "kservice"
end
-
+
it "writes release manifests" do
k = KdeFrameworksRelease.new @manifest_handler
k.read_generic_manifests
-
+
k.write_release_manifests( "2014-02-01", "4.9.90" )
-
+
manifest_path = File.join( @manifest_dir,
"karchive/karchive.2014-02-01.manifest" )
expect( File.exists? manifest_path ).to be true
@@ -48,7 +48,7 @@ describe KdeFrameworksRelease do
manifest_path = File.join( @manifest_dir,
"kservice/kservice.2014-02-01.manifest" )
expect( File.exists? manifest_path ).to be true
-
+
manifest = Manifest.parse_file( manifest_path )
expect(manifest.class).to be ManifestRelease
expect( manifest.name ).to eq "kservice"
@@ -72,5 +72,5 @@ describe KdeFrameworksRelease do
it "strips patch release" do
expect(KdeFrameworksRelease.strip_patch_release("5.4.0")).to eq "5.4"
end
-
+
end
diff --git a/spec/unit/manifest_handler_spec.rb b/spec/unit/manifest_handler_spec.rb
index 71ffc63..627b6f6 100644
--- a/spec/unit/manifest_handler_spec.rb
+++ b/spec/unit/manifest_handler_spec.rb
@@ -6,17 +6,17 @@ describe ManifestHandler do
let(:settings) do
s = Settings.new
- s.manifest_path = File.expand_path('spec/data/')
+ s.manifest_path = File.expand_path('spec/data/manifests')
s.offline = true
s
end
-
+
let(:mh) do
mh = ManifestHandler.new settings
mh.read_remote
mh
end
-
+
it "reads manifests" do
expect(mh.manifests.count).to eq 5
expect(mh.libraries.count).to eq 5
@@ -53,33 +53,33 @@ describe ManifestHandler do
File.expand_path( \
"~/.local/share/inqlude/manifests/mylib/mylib.2014-02-01.manifest" ) ) end
end
-
+
describe "#libraries" do
it "returns all libraries" do
expect( mh.libraries.count ).to eq 5
end
-
+
it "returns stable libraries" do
libraries = mh.libraries :stable
expect( libraries.count ).to eq 2
expect( libraries.first.manifests.last.name ).to eq "awesomelib"
expect( libraries.first.manifests.last.version ).to eq "0.2.0"
end
-
+
it "returns development versions" do
libraries = mh.libraries :edge
expect( libraries.count ).to eq 1
expect( libraries.first.manifests.last.name ).to eq "bleedingedge"
expect( libraries.first.manifests.last.version ).to eq "edge"
end
-
+
it "returns unreleased libraries" do
libraries = mh.unreleased_libraries
expect( libraries.count ).to eq 1
expect( libraries.first.manifests.last.name ).to eq "newlib"
end
-
+
it "returns commercial libraries" do
libraries = mh.commercial_libraries
expect( libraries.count ).to eq 3
@@ -88,7 +88,7 @@ describe ManifestHandler do
end
end
-
+
describe "#group" do
it "returns all libraries of a group" do
libraries = mh.group("kde-frameworks")
@@ -96,16 +96,16 @@ describe ManifestHandler do
expect( libraries.first.manifests.last.name ).to eq "awesomelib"
end
end
-
+
describe "#library" do
-
+
it "returns one library" do
library = mh.library "awesomelib"
expect( library.name ).to eq "awesomelib"
end
-
+
end
-
+
context "library with generic and release manifest" do
use_given_filesystem
@@ -116,34 +116,34 @@ describe ManifestHandler do
given_file "karchive.2014-02-01.manifest", :from => \
"karchive-release-beta.manifest" end
end
-
+
s = Settings.new
s.manifest_path = @manifest_path
s.offline = true
@manifest_handler = ManifestHandler.new s
@manifest_handler.read_remote
end
-
+
it "reads generic manifest" do
expect( @manifest_handler.library("karchive").manifests.count ).to eq 2
generic_manifest = @manifest_handler.library("karchive").generic_manifest
expect( generic_manifest.name ).to eq "karchive"
expect( generic_manifest.class ).to be ManifestGeneric
end
-
+
it "lists development versions" do
libraries = @manifest_handler.libraries :beta
expect( libraries.count ).to eq 1
expect( libraries.first.latest_manifest.name ).to eq "karchive"
expect( libraries.first.latest_manifest.version ).to eq "4.9.90"
end
-
+
it "lists unreleased libraries" do
libraries = @manifest_handler.unreleased_libraries
expect( libraries.count ).to eq 0
end
end
-
+
it "generates inqlude-all.json" do
expected_json = File.read(test_data_path("inqlude-all.json"))
expect(mh.generate_inqlude_all).to eq expected_json
diff --git a/spec/unit/spec_helper.rb b/spec/unit/spec_helper.rb
index 7e2f557..86a10dd 100644
--- a/spec/unit/spec_helper.rb
+++ b/spec/unit/spec_helper.rb
@@ -23,10 +23,9 @@ def create_generic_manifest name
end
shared_context "manifest_files" do
-
let(:settings) do
s = Settings.new
- s.manifest_path = File.expand_path('spec/data/')
+ s.manifest_path = File.expand_path('spec/data/manifests')
s.offline = true
s
end
@@ -42,5 +41,4 @@ shared_context "manifest_files" do
let(:proprietarylib_manifest_file) do
"proprietarylib/proprietarylib.2013-12-22.manifest"
end
-
end
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic