typingpool 0.8.11 → 0.8.13

data/test/test_integration_script_1_tp_config.rb

@@ -10,7 +10,7 @@ class TestTpConfig < Typingpool::Test::Script
 
 def test_abort_with_invalid_file
   exception = assert_raises(Typingpool::Error::Shell) do
-    tp_config(File.join(fixtures_dir, 'not_yaml.txt'))
+    call_script('tp-config', File.join(fixtures_dir, 'not_yaml.txt'))
   end
   assert_match(/not valid yaml/i, exception.message)
 end
@@ -20,7 +20,7 @@ def test_abort_with_directory_path
   assert(File.exist? dir)
   assert(File.directory? dir)
   exception = assert_raises(Typingpool::Error::Shell) do
-    tp_config(dir)
+    call_script('tp-config', dir)
   end
   assert_match(/not a file/i, exception.message)
 end
@@ -29,19 +29,19 @@ def test_abort_with_invalid_path
   path = '/jksdljs/euwiroeuw'
   refute(File.exist? path)
   exception = assert_raises(Typingpool::Error::Shell) do
-    tp_config(path)
+    call_script('tp-config', path)
   end
   assert_match(/valid path/i, exception.message)
 end
 
 def test_usage_message
-  out, _ = tp_config('--help')
+  out, _ = call_script('tp-config', '--help')
   assert(out)
   assert_match(/\bUSAGE:/, out)
 end
 
 def test_new_config_creation
-  in_temp_dir do |dir|
+  Typingpool::Utility.in_temp_dir do |dir|
     path = {
       :config => File.join(dir, 'config.yml'),
       :transcript_dir => File.join(dir, 'transcriptionz')
@@ -62,7 +62,7 @@ def test_new_config_creation
 end
 
 def test_config_editing
-  in_temp_dir do |dir|
+  Typingpool::Utility.in_temp_dir do |dir|
     path = {
       :config => File.join(dir, 'config.yml'),
       :fixture => File.join(fixtures_dir, 'config-1'),
@@ -88,7 +88,7 @@ def test_config_editing
 end
 
 def test_skips_bucket_when_sftp_params_exist
-  in_temp_dir do |dir|
+  Typingpool::Utility.in_temp_dir do |dir|
     path = {
       :config => File.join(dir, 'config.yml'),
       :fixture => File.join(fixtures_dir, 'config-2'),

data/test/test_integration_script_2_tp_make.rb

@@ -32,9 +32,9 @@ class TestTpMake < Typingpool::Test::Script
         'host' => 'example.com',
         'url' => 'http://example.com/foobar'
       }
-      write_config(config, dir)
+      write_config(dir, config)
       exception = assert_raises(Typingpool::Error::Shell) do
-        call_tp_make('--file', audio_files[0], '--title', 'Foo', '--config', config_path(dir), '--testnoupload')
+        call_script('tp-make', '--file', audio_files[0], '--title', 'Foo', '--config', config_path(dir), '--testnoupload')
       end
       assert_match(/must begin with 'https'/i, exception.message)
     end #with_temp_transcripts_dir do...
@@ -43,7 +43,7 @@ class TestTpMake < Typingpool::Test::Script
   def assert_tp_make_abort_match(args, regex)
     args.push('--testnoupload')
     assert_script_abort_match(args, regex) do |new_args|
-      call_tp_make(*new_args)
+      call_script('tp-make', *new_args)
     end
   end
 
@@ -85,7 +85,7 @@ class TestTpMake < Typingpool::Test::Script
         config_path = self.config_path(dir)
         skip_if_no_upload_credentials('tp-make audio handling test', Typingpool::Config.file(config_path))
         tp_make(dir, config_path, subdir, true)
-        assert(project = transcripts_dir_project(dir, Typingpool::Config.file(config_path)))
+        assert(project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path)))
         check_project_files(project)
       end #with_temp_transcripts_dir
     end #Dir.entries
@@ -97,7 +97,7 @@ class TestTpMake < Typingpool::Test::Script
       skip_if_no_sftp_credentials('tp-make SFTP upload test', config)
       begin
         tp_make(dir)
-        assert(project = transcripts_dir_project(dir))
+        assert(project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir))))
         check_project_files(project)
         check_project_uploads(project)
       ensure
@@ -110,10 +110,10 @@ class TestTpMake < Typingpool::Test::Script
   def test_tp_make_s3
     with_temp_transcripts_dir do |dir|
       skip_if_no_s3_credentials('tp-make S3 integration test', config)
-      config_path = setup_s3_config(dir)
+      config_path = write_config(dir, reconfigure_for_s3(Typingpool::Config.file(config_path(dir))))
       begin
         tp_make_with_vcr(dir, 'tp_make_1', config_path)
-        assert(project = transcripts_dir_project(dir, Typingpool::Config.file(config_path)))
+        assert(project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path)))
         check_project_files(project)
         check_project_uploads(project, (Typingpool::Test.live || Typingpool::Test.record))
       ensure
@@ -128,12 +128,12 @@ class TestTpMake < Typingpool::Test::Script
     with_temp_transcripts_dir do |dir|
       config = Typingpool::Config.file(config_path(dir))
       skip_if_no_s3_credentials('tp-make failed upload integration test', config)
-      good_config_path = setup_s3_config(dir)
-      bad_config_path = setup_s3_config_with_bad_password(dir)
+      good_config_path = write_config(dir, reconfigure_for_s3(config))
+      bad_config_path = write_s3_config_with_bad_password(dir)
       assert_raises(Typingpool::Error::Shell) do
         tp_make(dir, bad_config_path, 'mp3')
       end
-      assert(project = transcripts_dir_project(dir))
+      assert(project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir))))
       project_dir = project.local.path
       assert(File.exist? project_dir)
       assert(File.directory? project_dir)
@@ -145,7 +145,7 @@ class TestTpMake < Typingpool::Test::Script
       assert_all_assets_have_upload_status(assignment_csv, 'audio', 'maybe')
       assert(audio_urls = assignment_csv.map{|assignment| assignment['audio_url'] })
       refute_empty(audio_urls)
-      assert_empty(audio_urls.select{|url| working_url? url })
+      assert_empty(audio_urls.select{|url| Typingpool::Utility.working_url? url })
       begin
         tp_make_with_vcr(dir, 'tp_make_2', good_config_path)
         refute_empty(assignment_csv.read)
@@ -169,7 +169,7 @@ class TestTpMake < Typingpool::Test::Script
       assert(audio_files('mp3').count > 1)
       correctly_ordered_paths = audio_files('mp3').sort
       tp_make(dir, config_path, 'mp3', true)
-      assert(project = transcripts_dir_project(dir))
+      assert(project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir))))
       check_project_files(project)
       assert(merged_audio_file = project.local.subdir('audio','originals').files.detect{|filer| filer.path.match(/.\.all\../)})
       assert(File.exist? merged_audio_file)

data/test/test_integration_script_3_tp_assign.rb

@@ -5,6 +5,8 @@ $LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
+require 'typingpool/utility/test'
+include Typingpool::Utility::Test
 
 class TestTpAssign < Typingpool::Test::Script
 
@@ -12,7 +14,7 @@ class TestTpAssign < Typingpool::Test::Script
   #(or at least some xml parsing) since rturk doesn't provide an
   #easy way to look at HIT qualifications)
   def test_abort_with_no_input
-    assert_raises(Typingpool::Error::Shell){call_tp_assign}
+    assert_raises(Typingpool::Error::Shell){call_script('tp-assign','--sandbox')}
   end
 
   def test_abort_with_no_template
@@ -41,9 +43,9 @@ class TestTpAssign < Typingpool::Test::Script
         'host' => 'example.com',
         'url' => 'http://example.com/foobar'
       }
-      write_config(config, dir)
+      write_config(dir, config)
       exception = assert_raises(Typingpool::Error::Shell) do
-        call_tp_assign(project_default[:title], assign_default[:template], '--config', config_path(dir))
+        call_script('tp-assign','--sandbox', project_default[:title], assign_default[:template], '--config', config_path(dir))
       end
       assert_match(/must begin with 'https'/i, exception.message)
     end #with_temp_readymade_project do |dir|
@@ -51,7 +53,7 @@ class TestTpAssign < Typingpool::Test::Script
   
   def assert_tp_assign_abort_match(args, regex)
     assert_script_abort_match(args, regex) do |new_args|
-      call_tp_assign(*new_args)
+      call_script('tp-assign', '--sandbox', *new_args)
     end
   end
 
@@ -59,14 +61,14 @@ class TestTpAssign < Typingpool::Test::Script
     skip_if_no_amazon_credentials('tp-assign integration test')
     skip_if_no_s3_credentials('tp-assign integration test')
     with_temp_readymade_project do |dir|
-      project = transcripts_dir_project(dir)
+      project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir)))
       vcr_names = ['tp_assign_1', 'tp_assign_2']
       copy_tp_assign_fixtures(dir, vcr_names[0])
       config = Typingpool::Config.file(config_path(dir))
       Typingpool::Amazon.setup(:sandbox => true, :config => Typingpool::Config.file(config_path(dir)))
       with_vcr(vcr_names[1], config, {
                  :preserve_exact_body_bytes => true,
-                 :match_requests_on => [:method, Typingpool::App.vcr_core_host_matcher]
+                 :match_requests_on => [:method, vcr_core_host_matcher]
                }) do
         begin
           assign_time = (Typingpool::Test.record || Typingpool::Test.live) ? Time.now : project_time(project)
@@ -82,7 +84,7 @@ class TestTpAssign < Typingpool::Test::Script
           assign_default[:keyword].each{|keyword| assert_includes(keywords, keyword)}
           sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
           refute_empty(assignment_urls = sandbox_csv.map{|assignment| assignment['assignment_url'] })
-          assert(assignment_html = fetch_url(assignment_urls.first).body)
+          assert(assignment_html = Typingpool::Utility.fetch_url(assignment_urls.first).body)
           assert_match(/\b22[\s-]+second\b/, assignment_html)
           assert_all_assets_have_upload_status(sandbox_csv, 'assignment', 'yes')
         ensure
@@ -97,12 +99,12 @@ class TestTpAssign < Typingpool::Test::Script
     skip_if_no_amazon_credentials('tp-assign unuploaded audio integration test')
     skip_if_no_s3_credentials('tp-assign unuploaded audio integration test')
     with_temp_readymade_project do |dir|
-      project = transcripts_dir_project(dir)
+      project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir)))
       vcr_name = 'tp_assign_3'
       copy_tp_assign_fixtures(dir, vcr_name)
       csv = project.local.file('data', 'assignment.csv').as(:csv)
       if (Typingpool::Test.record || Typingpool::Test.live)
-        assert_empty(csv.select{|assignment| working_url? assignment['audio_url']})
+        assert_empty(csv.select{|assignment| Typingpool::Utility.working_url? assignment['audio_url']})
       end
       csv.each{|assignment| assert_empty(assignment['audio_uploaded'].to_s) }
       begin
@@ -123,14 +125,14 @@ class TestTpAssign < Typingpool::Test::Script
     skip_if_no_amazon_credentials('tp-assign failed assignment upload integration test')
     skip_if_no_s3_credentials('tp-assign failed assignment upload integration test')
     with_temp_readymade_project do |dir|
-      good_config_path = setup_s3_config(dir)
-      reconfigure_readymade_project_in(good_config_path)
-      project = transcripts_dir_project(dir, Typingpool::Config.file(good_config_path))
+      config = reconfigure_for_s3(Typingpool::Config.file(config_path(dir)))
+      good_config_path = write_config(dir, config)
+      project = Typingpool::Project.new(project_default[:title], config)
       vcr_names = ['tp_assign_4', 'tp_assign_5']
       copy_tp_assign_fixtures(dir, vcr_names[0], good_config_path)
       csv = project.local.file('data', 'assignment.csv').as(:csv)
       csv.each!{|a| a['audio_uploaded'] = 'yes'}
-      bad_config_path = setup_s3_config_with_bad_password(dir)
+      bad_config_path = write_s3_config_with_bad_password(dir)
       get_assignment_urls = lambda{|assignments| assignments.map{|assignment| assignment['assignment_url'] }.select{|url| url } }
       assert_empty(get_assignment_urls.call(csv))
       begin
@@ -141,7 +143,7 @@ class TestTpAssign < Typingpool::Test::Script
         sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
         refute_empty(get_assignment_urls.call(sandbox_csv))
         if (Typingpool::Test.record || Typingpool::Test.live)
-          get_assignment_urls.call(sandbox_csv).each{|url| refute(working_url? url) }
+          get_assignment_urls.call(sandbox_csv).each{|url| refute(Typingpool::Utility.working_url? url) }
         end
         assert_all_assets_have_upload_status(sandbox_csv, 'assignment', 'maybe')
         tp_assign_with_vcr(dir, vcr_names[1], good_config_path)
@@ -158,14 +160,14 @@ class TestTpAssign < Typingpool::Test::Script
   def test_abort_on_config_mismatch
     skip_if_no_s3_credentials('tp-assign abort on config mismatch test')
     with_temp_readymade_project do |dir|
-      config = Typingpool::Config.file(config_path(dir))
-      good_config_path = setup_s3_config(dir, config, '.config_s3_good')
-      reconfigure_readymade_project_in(good_config_path)
+      config = reconfigure_for_s3(Typingpool::Config.file(config_path(dir)))
+      good_config_path = write_config(dir, config, '.config_s3_good')
+      reconfigure_project(Typingpool::Project.new(project_default[:title], config))
       assert(config.amazon.bucket)
       new_bucket = 'configmismatch-test'
       refute_equal(new_bucket, config.amazon.bucket)
       config.amazon.bucket = new_bucket
-      bad_config_path = setup_s3_config(dir, config, '.config_s3_bad')
+      bad_config_path = write_config(dir, config, '.config_s3_bad')
       success = false
       begin
         exception = assert_raises(Typingpool::Error::Shell) do
@@ -181,10 +183,10 @@ class TestTpAssign < Typingpool::Test::Script
 
   def test_displays_and_uses_correct_reward_default
     with_temp_readymade_project do |dir| 
-      project = transcripts_dir_project(dir)
+      project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir)))
       config = Typingpool::Config.file(config_path(dir))
       config.assign.reward = '0.06'
-      write_config(config, File.dirname(config_path(dir)), File.basename(config_path(dir)))
+      write_config(dir, config)
       vcr_names = ['tp_assign_6', 'tp_assign_7']
       copy_tp_assign_fixtures(dir, vcr_names[0])
       config = Typingpool::Config.file(config_path(dir))
@@ -192,7 +194,7 @@ class TestTpAssign < Typingpool::Test::Script
       Typingpool::Amazon.setup(:sandbox => true, :config => config)
       with_vcr(vcr_names[1], config, {
                  :preserve_exact_body_bytes => true,
-                 :match_requests_on => [:method, Typingpool::App.vcr_core_host_matcher]
+                 :match_requests_on => [:method, vcr_core_host_matcher]
                }) do
         begin
           _, err = tp_assign_with_vcr(dir, vcr_names[0])

data/test/test_integration_script_4_tp_review.rb

@@ -8,59 +8,192 @@ require 'typingpool/test'
 
 class TestTpReview < Typingpool::Test::Script
 
-  def test_tp_review
+  def test_tp_review_with_project_specified
     with_temp_readymade_project do |dir|
       skip_if_no_upload_credentials('tp-review integration test')
       skip_if_no_amazon_credentials('tp-review integration test')
-      copy_fixtures_to_transcripts_dir(dir, 'tp_review_')
-      project = transcripts_dir_project(dir)
+      copy_fixtures_to_project_dir('tp_review_', File.join(dir, project_default[:title]))
+      project = Typingpool::Project.new(project_default[:title], Typingpool::Config.file(config_path(dir)))
       assert(File.exist? File.join(project.local, 'data','sandbox-assignment.csv'))
-      assert_equal(7, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
+      assert_equal(6, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
       begin
         output = nil
-        output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-1'), %w(a r a r s q))
+        output = tp_review_with_fixture(dir, 'tp-review-1', %w(a r a r s q), false, project_default[:title])
         assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
-        assert_equal(5, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
+        assert_equal(2, project_hits_approved(project).count)
+        assert_equal(2, project_hits_rejected(project).count)
+        assert_equal(2, project_hits_pending(project).count)
         reviews = split_reviews(output[:out])
         assert_match(/Interview\.00\.00/, reviews[1])
         #we can't specify leading \b boundaries because the ansi
         #escape sequences mess that up
         assert_match(/Approved\b/i, reviews[1])
-        assert_match(/Interview\.00\.20/, reviews[2])
+        assert_match(/Interview\.00\.22/, reviews[2])
         assert_match(/reason\b/i, reviews[2])
         assert_match(/Rejected\b/i, reviews[2])
-        assert_match(/Interview\.00\.40/, reviews[3])
+        assert_match(/Interview\.00\.44/, reviews[3])
         assert_match(/Approved\b/i, reviews[3])
-        assert_match(/Interview\.01\.00/, reviews[4])
+        assert_match(/Interview\.01\.06/, reviews[4])
         assert_match(/reason\b/i, reviews[4])
         assert_match(/Rejected\b/i, reviews[4])
-        assert_match(/Interview\.01\.20/, reviews[5])
+        assert_match(/Interview\.01\.28/, reviews[5])
         assert_match(/Skipping\b/i, reviews[5])
-        assert_match(/Interview\.02\.00/, reviews[6])
+        assert_match(/Interview\.01\.50/, reviews[6])
         assert_match(/Quitting\b/i, reviews[6])
-        transcript = assert_has_partial_transcript(dir)
+        transcript = assert_has_partial_transcript(project)
         assert_html_has_audio_count(2, transcript)
         assert_assignment_csv_has_transcription_count(2, project, 'sandbox-assignment.csv')
-        output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-2'), %w(a r))
+
+        output = tp_review_with_fixture(dir, 'tp-review-2', %w(a q), false, project_default[:title])
         assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
-        assert_equal(4, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
+        assert_equal(3, project_hits_approved(project).count)
+        assert_equal(2, project_hits_rejected(project).count)
+        assert_equal(1, project_hits_pending(project).count)
         reviews = split_reviews(output[:out])
-        assert_match(/Interview\.01\.20/, reviews[1])
+        assert_match(/Interview\.01\.28/, reviews[1])
         assert_match(/Approved\b/i, reviews[1])
-        assert_match(/Interview\.02\.00/, reviews[2])
-        assert_match(/reason\b/i, reviews[2])
-        assert_match(/Rejected\b/i, reviews[2])
-        transcript = assert_has_partial_transcript(dir)
+        assert_match(/Interview\.01\.50/, reviews[2])
+        assert_match(/Quitting\b/i, reviews[2])
+        transcript = assert_has_partial_transcript(project)
         assert_html_has_audio_count(3, transcript)
         assert_assignment_csv_has_transcription_count(3, project, 'sandbox-assignment.csv')
+
+        output = tp_review_with_fixture(dir, 'tp-review-6', %w(q), false, project_default[:title])
+        assert_equal(4, project_hits_approved(project).count)
+        assert_equal(2, project_hits_rejected(project).count)
+        assert_equal(0, project_hits_pending(project).count)
+        assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
+        transcript = assert_has_partial_transcript(project)
+        assert_html_has_audio_count(4, transcript)
+        assert_assignment_csv_has_transcription_count(4, project, 'sandbox-assignment.csv')
       ensure
-        rm_fixtures_from_transcripts_dir(dir, 'tp_review_')
+        restore_project_dir_from_fixtures('tp_review_', File.join(dir, project_default[:title]))
       end #begin
     end #with_temp_readymade_project do...
   end
 
-  def split_reviews(output)
-    output.split(/Transcript for\b/)
+   def test_tp_review_without_project_specified
+     skip_if_no_upload_credentials('tp-review integration test')
+     skip_if_no_amazon_credentials('tp-review integration test')
+     with_temp_readymade_project do |transcripts_dir|
+       project_title = [ project_default[:title], "Second #{project_default[:title]}" ] 
+       FileUtils.cp_r(File.join(transcripts_dir, project_title[0]), File.join(transcripts_dir, project_title[1]))
+       copy_fixtures_to_project_dir('tp_review2a_', File.join(transcripts_dir, project_title[0]))
+       copy_fixtures_to_project_dir('tp_review2b_', File.join(transcripts_dir, project_title[1]))
+       project = project_title.sort.map{|title| Typingpool::Project.new(title, Typingpool::Config.file(config_path(transcripts_dir))) }      
+       project.each do |project|
+         assert(File.exist? File.join(project.local, 'data','sandbox-assignment.csv'))
+         assert_equal(6, project_hits_pending(project).count)
+       end
+      begin
+        output = tp_review_with_fixture(transcripts_dir, 'tp-review-3', %w(a r a r s s r a a s a q), false)
+        assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
+        reviews = split_reviews(output[:out])
+        
+        assert_equal(2, project_hits_approved(project[0]).count)
+        assert_equal(2, project_hits_rejected(project[0]).count)
+        assert_equal(2, project_hits_pending(project[0]).count)
+        assert_match(/Interview\.00\.00/, reviews[1])
+        #we can't specify leading \b boundaries because the ansi
+        #escape sequences mess that up
+        assert_match(/Approved\b/i, reviews[1])
+        assert_match(/Interview\.00\.22/, reviews[2])
+        assert_match(/reason\b/i, reviews[2])
+        assert_match(/Rejected\b/i, reviews[2])
+        assert_match(/Interview\.00\.44/, reviews[3])
+        assert_match(/Approved\b/i, reviews[3])
+        assert_match(/Interview\.01\.06/, reviews[4])
+        assert_match(/reason\b/i, reviews[4])
+        assert_match(/Rejected\b/i, reviews[4])
+        assert_match(/Interview\.01\.28/, reviews[5])
+        assert_match(/Skipping\b/i, reviews[5])
+        assert_match(/Interview\.01\.50/, reviews[6])
+        assert_match(/Skipping/i, reviews[6])
+        transcript = assert_has_partial_transcript(project[0])
+        assert_html_has_audio_count(2, transcript)
+        assert_assignment_csv_has_transcription_count(2, project[0], 'sandbox-assignment.csv')
+        
+        assert_equal(3, project_hits_approved(project[1]).count)
+        assert_equal(1, project_hits_rejected(project[1]).count)
+        assert_equal(2, project_hits_pending(project[1]).count)
+        assert_match(/Interview\.00\.00/, reviews[7])
+        assert_match(/Rejected\b/i, reviews[7])
+        assert_match(/reason\b/i, reviews[7])
+        assert_match(/Interview\.00\.22/, reviews[8])
+        assert_match(/Approved\b/i, reviews[8])
+        assert_match(/Interview\.00\.44/, reviews[9])
+        assert_match(/Approved\b/i, reviews[9])
+        assert_match(/Interview\.01\.06/, reviews[10])
+        assert_match(/Skipping\b/i, reviews[10])
+        assert_match(/Interview\.01\.28/, reviews[11])
+        assert_match(/Approved\b/i, reviews[11])
+        assert_match(/Interview\.01\.50/, reviews[12])
+        assert_match(/Quitting\b/i, reviews[12])
+        transcript = assert_has_partial_transcript(project[1])
+        assert_html_has_audio_count(3, transcript)
+        assert_assignment_csv_has_transcription_count(3, project[1], 'sandbox-assignment.csv')
+
+        output = tp_review_with_fixture(transcripts_dir, 'tp-review-4', %w(a r s a), false)
+        assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
+        reviews = split_reviews(output[:out])
+        
+        assert_equal(3, project_hits_approved(project[0]).count)
+        assert_equal(3, project_hits_rejected(project[0]).count)
+        assert_equal(0, project_hits_pending(project[0]).count)
+        assert_match(/Interview\.01\.28/, reviews[1])
+        assert_match(/Approved\b/i, reviews[1])
+        assert_match(/Interview\.01\.50/, reviews[2])
+        assert_match(/reason\b/i, reviews[2])
+        assert_match(/Rejected\b/i, reviews[2])
+        transcript = assert_has_partial_transcript(project[0])
+        assert_html_has_audio_count(3, transcript)
+        assert_assignment_csv_has_transcription_count(3, project[0], 'sandbox-assignment.csv')
+
+        assert_equal(4, project_hits_approved(project[1]).count)
+        assert_equal(1, project_hits_rejected(project[1]).count)
+        assert_equal(1, project_hits_pending(project[1]).count)
+        assert_match(/Interview\.01\.06/, reviews[3])
+        assert_match(/Skipping\b/i, reviews[3])
+        assert_match(/Interview\.01\.50/, reviews[4])
+        assert_match(/Approved\b/i, reviews[4])
+        transcript = assert_has_partial_transcript(project[1])
+        assert_html_has_audio_count(4, transcript)
+        assert_assignment_csv_has_transcription_count(4, project[1], 'sandbox-assignment.csv')
+
+        output = tp_review_with_fixture(transcripts_dir, 'tp-review-5', %w(q), false)
+        assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
+        assert_equal(5, project_hits_approved(project[1]).count)
+        assert_equal(1, project_hits_rejected(project[1]).count)
+        assert_equal(0, project_hits_pending(project[1]).count)
+        transcript = assert_has_partial_transcript(project[1])
+        assert_html_has_audio_count(5, transcript)
+        assert_assignment_csv_has_transcription_count(5, project[1], 'sandbox-assignment.csv')
+      ensure
+        restore_project_dir_from_fixtures('tp_review2a_', File.join(transcripts_dir, project_title[0]))
+        restore_project_dir_from_fixtures('tp_review2b_', File.join(transcripts_dir, project_title[1]))
+      end #begin      
+    end #with_temp_readymade_project
   end
+  
+
+   def project_hits_rejected(project)
+     project.local.file('data','sandbox-assignment.csv').as(:csv).select{|assignment| assignment_rejected?(assignment) }
+   end
+   
+   def project_hits_approved(project)
+     project.local.file('data','sandbox-assignment.csv').as(:csv).select{|assignment| assignment_approved?(assignment) }
+   end
+
+   def project_hits_pending(project)
+     project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment_approved?(assignment) || assignment_rejected?(assignment)}
+   end
+
+   def assignment_rejected?(assignment)
+     assignment['hit_id'].to_s.empty?
+   end
 
-end #class TestTpReview
+   def assignment_approved?(assignment)
+     assignment['transcript'].to_s.match(/\S/)
+   end
+   
+ end #class TestTpReview