Proper discovery of spec files

Author: Glenn Matthews

Rakefile

@@ -9,34 +9,26 @@ task default: %w(rubocop spec build)
 
 RuboCop::RakeTask.new
 
+RSpec::Core::RakeTask.new(:spec_common) do |t|
+  t.pattern = 'spec/*_spec.rb'
+  t.rspec_opts = '--format documentation'
+  t.verbose = false
+end
+spec_tasks = [:spec_common]
+
 # Because each of the below specs requires a clean Ruby environment,
 # they need to be run individually instead of as a single RSpec task.
-RSpec::Core::RakeTask.new(:spec_no_clients) do |t|
-  t.pattern = 'spec/no_clients_spec.rb'
-end
-RSpec::Core::RakeTask.new(:spec_nxapi_only) do |t|
-  t.pattern = 'spec/nxapi_only_spec.rb'
-end
-RSpec::Core::RakeTask.new(:spec_grpc_only) do |t|
-  t.pattern = 'spec/grpc_only_spec.rb'
-end
-RSpec::Core::RakeTask.new(:spec_all_clients) do |t|
-  t.pattern = 'spec/all_clients_spec.rb'
-end
-RSpec::Core::RakeTask.new(:spec_yaml) do |t|
-  t.pattern = 'spec/yaml_spec.rb'
-end
-RSpec::Core::RakeTask.new(:spec_whitespace) do |t|
-  t.pattern = 'spec/whitespace_spec.rb'
+Dir.glob('spec/isolate/*_spec.rb').each do |f|
+  task = File.basename(f, '.rb').to_sym
+  RSpec::Core::RakeTask.new(task) do |t|
+    t.pattern = f
+    t.rspec_opts = '--format documentation'
+    t.verbose = false
+  end
+  spec_tasks << task
 end
 
-task spec: [:spec_no_clients,
-            :spec_nxapi_only,
-            :spec_grpc_only,
-            :spec_all_clients,
-            :spec_yaml,
-            :spec_whitespace,
-           ]
+task spec: spec_tasks
 
 task :build do
   system 'gem build cisco_node_utils.gemspec'

bin/git/hooks/pre-commit/validate-yaml

@@ -6,7 +6,7 @@
 # Run the Kwalify YAML schema validation
 
 step_name "Validating YAML files"
-rake spec_yaml
+rspec "$REPO_DIR"/spec/yaml_spec.rb
 check_rc "Please fix YAML schema validation failures before committing"
 
 # Ensure that command_reference can parse all the YAML as well

spec/all_clients_spec.rb spec/isolate/all_clients_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper.rb'
+require_relative '../spec_helper.rb'
 
 context 'when both clients are installed' do
   it 'should have both clients' do

spec/grpc_only_spec.rb spec/isolate/grpc_only_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper.rb'
+require_relative '../spec_helper.rb'
 
 context 'when only gRPC client is installed' do
   let(:main_self) { TOPLEVEL_BINDING.eval('self') }

spec/no_clients_spec.rb spec/isolate/no_clients_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper.rb'
+require_relative '../spec_helper.rb'
 require 'rspec/core'
 
 context 'when no client implementations are installed' do

spec/nxapi_only_spec.rb spec/isolate/nxapi_only_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper.rb'
+require_relative '../spec_helper.rb'
 
 context 'when only NXAPI client is installed' do
   let(:main_self) { TOPLEVEL_BINDING.eval('self') }