From 245f14af3690b1cd833fb3e8d9fcb0536f2a7574 Mon Sep 17 00:00:00 2001 From: ABaldwinHunter Date: Wed, 27 Jan 2016 17:57:27 -0500 Subject: [PATCH] Minor refactor Clean specs, remove unused method. --- spec/cc/engine/analyzers/javascript/main_spec.rb | 7 +++---- spec/cc/engine/analyzers/php/main_spec.rb | 8 +------- spec/cc/engine/analyzers/python/main_spec.rb | 6 ++---- spec/cc/engine/analyzers/ruby/main_spec.rb | 3 +-- spec/spec_helper.rb | 1 + 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/spec/cc/engine/analyzers/javascript/main_spec.rb b/spec/cc/engine/analyzers/javascript/main_spec.rb index 5b361ee5..cc23acb8 100644 --- a/spec/cc/engine/analyzers/javascript/main_spec.rb +++ b/spec/cc/engine/analyzers/javascript/main_spec.rb @@ -1,9 +1,8 @@ +require 'spec_helper' require 'cc/engine/analyzers/javascript/main' require 'cc/engine/analyzers/reporter' require 'cc/engine/analyzers/engine_config' require 'cc/engine/analyzers/file_list' -require 'flay' -require 'tmpdir' RSpec.describe CC::Engine::Analyzers::Javascript::Main, in_tmpdir: true do include AnalyzerSpecHelpers @@ -93,8 +92,8 @@ Login EOJSX - result = run_engine(engine_conf).strip - issues = result.split("\0") + issues = run_engine(engine_conf).strip.split("\0") + expect(issues.length).to eq 1 end diff --git a/spec/cc/engine/analyzers/php/main_spec.rb b/spec/cc/engine/analyzers/php/main_spec.rb index 083620c8..9060f943 100644 --- a/spec/cc/engine/analyzers/php/main_spec.rb +++ b/spec/cc/engine/analyzers/php/main_spec.rb @@ -1,9 +1,8 @@ +require 'spec_helper' require 'cc/engine/analyzers/php/main' require 'cc/engine/analyzers/reporter' require 'cc/engine/analyzers/engine_config' require 'cc/engine/analyzers/file_list' -require 'flay' -require 'tmpdir' RSpec.describe CC::Engine::Analyzers::Php::Main, in_tmpdir: true do include AnalyzerSpecHelpers @@ -93,11 +92,6 @@ end end - def printed_issue - issue = {"type":"issue","check_name":"Identical code","description":"Similar code found in 1 other location","categories":["Duplication"],"location":{"path":"foo.php","lines":{"begin":2,"end":6}},"remediation_points":176000,"other_locations":[{"path":"foo.php","lines":{"begin":10,"end":14}}],"content":{"body": read_up}} - issue.to_json + "\0\n" - end - def engine_conf CC::Engine::Analyzers::EngineConfig.new({ 'config' => { diff --git a/spec/cc/engine/analyzers/python/main_spec.rb b/spec/cc/engine/analyzers/python/main_spec.rb index 1dc2ac83..8e449cdf 100644 --- a/spec/cc/engine/analyzers/python/main_spec.rb +++ b/spec/cc/engine/analyzers/python/main_spec.rb @@ -1,9 +1,7 @@ -require "spec_helper" -require "cc/engine/analyzers/python/main" +require 'spec_helper' +require 'cc/engine/analyzers/python/main' require 'cc/engine/analyzers/engine_config' require 'cc/engine/analyzers/file_list' -require "flay" -require "tmpdir" RSpec.describe CC::Engine::Analyzers::Python::Main, in_tmpdir: true do include AnalyzerSpecHelpers diff --git a/spec/cc/engine/analyzers/ruby/main_spec.rb b/spec/cc/engine/analyzers/ruby/main_spec.rb index 24fb8e5f..78ad75c8 100644 --- a/spec/cc/engine/analyzers/ruby/main_spec.rb +++ b/spec/cc/engine/analyzers/ruby/main_spec.rb @@ -1,8 +1,7 @@ +require 'spec_helper' require 'cc/engine/analyzers/ruby/main' require 'cc/engine/analyzers/engine_config' require 'cc/engine/analyzers/file_list' -require 'flay' -require 'tmpdir' module CC::Engine::Analyzers RSpec.describe Ruby::Main, in_tmpdir: true do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 17c03b37..33e507c5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,5 @@ require 'bundler/setup' +require 'flay' require 'tmpdir' Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f }