StatusSheets_spec.rb in taskjuggler-3.2.0

- old
+ new

@@ -24,11 +24,10 @@
   describe StatusSheetTest do
 
     include DaemonControl
 
     before(:all) do
-      @beforeExecuted = true
       # Make sure we run in the same directory as the spec file.
       @pwd = pwd
       cd(File.dirname(__FILE__))
       ENV['TASKJUGGLER_DATA_PATH'] = "../"
 
@@ -120,21 +119,23 @@
     ->8-
   }
 }
 EOT
       res = stdIoWrapper(prj) do
-        Tj3Client.new.main(%w( --unsafe --silent add . ))
+        Tj3Client.new.main(%w( --unsafe add . ))
       end
-      unless res.stdErr =~ /Project sstest loaded/
+      unless res.stdErr.include?("Info: Project(s) . added")
         raise "Project not loaded: #{res.stdErr}"
       end
       raise "Can't load project: #{res.stdErr}" unless res.returnValue == 0
 
       res = stdIoWrapper do
         Tj3SsSender.new.main(%w( --dryrun --silent -e 2011-03-23 ))
       end
+      unless res.returnValue == 0
+        raise " Status sheet template generation failed: #{res.stdErr}"
+      end
       @sss_mails = collectMails(res.stdOut)
-      raise " Status sheet generation failed" unless res.returnValue == 0
 
       @sheet = <<'EOT'
 # --------8<--------8<--------
 statussheet boss 2011-03-16-00:00-+0000 - 2011-03-23-00:00-+0000 {
 