diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
| commit | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (patch) | |
| tree | 39cf3564b1b2fb6be26499eda2a41be7ba59ad65 /vendor/gems/rspec-1.3.1/lib/autotest | |
| parent | ea977a0b9e86bc99a84de8577fa4ce1d304ac489 (diff) | |
| parent | 08dac0261325cd757b7146f9626f3c7b48cc672c (diff) | |
Merge branch 'release/0.6'0.6
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/en_IE/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/ga_IE/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
spec/fixtures/locale/en/app.po
Diffstat (limited to 'vendor/gems/rspec-1.3.1/lib/autotest')
| -rw-r--r-- | vendor/gems/rspec-1.3.1/lib/autotest/discover.rb | 3 | ||||
| -rw-r--r-- | vendor/gems/rspec-1.3.1/lib/autotest/rspec.rb | 54 |
2 files changed, 0 insertions, 57 deletions
diff --git a/vendor/gems/rspec-1.3.1/lib/autotest/discover.rb b/vendor/gems/rspec-1.3.1/lib/autotest/discover.rb deleted file mode 100644 index 3ac51c135..000000000 --- a/vendor/gems/rspec-1.3.1/lib/autotest/discover.rb +++ /dev/null @@ -1,3 +0,0 @@ -Autotest.add_discovery do - "rspec" if File.directory?('spec') && ENV['RSPEC'] -end diff --git a/vendor/gems/rspec-1.3.1/lib/autotest/rspec.rb b/vendor/gems/rspec-1.3.1/lib/autotest/rspec.rb deleted file mode 100644 index 73ffcb374..000000000 --- a/vendor/gems/rspec-1.3.1/lib/autotest/rspec.rb +++ /dev/null @@ -1,54 +0,0 @@ -require 'autotest' - -Autotest.add_hook :initialize do |at| - at.clear_mappings - # watch out for Ruby bug (1.8.6): %r(/) != /\// - at.add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _| - filename - } - at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| - ["spec/#{m[1]}_spec.rb"] - } - at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { - at.files_matching %r%^spec/.*_spec\.rb$% - } -end - -class RspecCommandError < StandardError; end - -class Autotest::Rspec < Autotest - - SPEC_PROGRAM = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')) - - def initialize - super - self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n\n?(.*?(\n\n\(.*?)?)\n\n/m - self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m - end - - def consolidate_failures(failed) - filters = new_hash_of_arrays - failed.each do |spec, trace| - if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/ - filters[$2] << spec - end - end - return filters - end - - def make_test_cmd(files_to_test) - files_to_test.empty? ? '' : - "#{ruby} #{SPEC_PROGRAM} --autospec #{normalize(files_to_test).keys.flatten.join(' ')} #{add_options_if_present}" - end - - def normalize(files_to_test) - files_to_test.keys.inject({}) do |result, filename| - result[File.expand_path(filename)] = [] - result - end - end - - def add_options_if_present # :nodoc: - File.exist?("spec/spec.opts") ? "-O #{File.join('spec','spec.opts')} " : "" - end -end |