4 files changed, 45 insertions, 7 deletions
diff --git a/spec/lib/alaveteli_external_command.rb b/spec/lib/alaveteli_external_command.rb
new file mode 100644
index 000000000..18afeda33
--- /dev/null
+++ b/spec/lib/alaveteli_external_command.rb
@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'alaveteli_external_command'
+
+script_dir = File.join(File.dirname(__FILE__), 'alaveteli_external_command_scripts')
+segfault_script = File.join(script_dir, 'segfault.sh')
+error_script = File.join(script_dir, 'error.sh')
+
+describe "when running external commands" do
+
+    it "should detect a non-zero exit status" do
+        $stderr.should_receive(:puts).with(/Error from/)
+        t = AlaveteliExternalCommand.run(error_script)
+        assert_nil t
+    end
+
+    it "should detect when an external command crashes" do
+        $stderr.should_receive(:puts).with(/exited abnormally/)
+        t = AlaveteliExternalCommand.run(segfault_script)
+        assert_nil t
+    end
+
+end
diff --git a/spec/lib/alaveteli_external_command_scripts/error.sh b/spec/lib/alaveteli_external_command_scripts/error.sh
new file mode 100755
index 000000000..65e74b3c6
--- /dev/null
+++ b/spec/lib/alaveteli_external_command_scripts/error.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "this is my error message" >&1
+exit 1
diff --git a/spec/lib/alaveteli_external_command_scripts/segfault.sh b/spec/lib/alaveteli_external_command_scripts/segfault.sh
new file mode 100755
index 000000000..f96ba5be8
--- /dev/null
+++ b/spec/lib/alaveteli_external_command_scripts/segfault.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+kill -11 $$
diff --git a/spec/models/profile_photo_spec.rb b/spec/models/profile_photo_spec.rb
index 0e157e2c5..e70f474a0 100644
--- a/spec/models/profile_photo_spec.rb
+++ b/spec/models/profile_photo_spec.rb
@@ -10,12 +10,12 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ProfilePhoto, "when constructing a new photo" do 
+describe ProfilePhoto, "when constructing a new photo" do
 
-    before do 
+    before do
         @mock_user = mock_model(User)
     end
-    
+
     it 'should take no image as invalid' do
         profile_photo = ProfilePhoto.new(:data => nil, :user => @mock_user)
         profile_photo.valid?.should == false
@@ -26,7 +26,15 @@ describe ProfilePhoto, "when constructing a new photo" do
         profile_photo.valid?.should == false
     end
 
-    it 'should accept and convert a PNG to right size' do 
+    it 'should translate a no image error message' do
+        I18n.with_locale(:es) do
+            profile_photo = ProfilePhoto.new(:data => nil, :user => @mock_user)
+            profile_photo.valid?.should == false
+            profile_photo.errors[:data].should == ['Por favor elige el fichero que contiene tu foto']
+        end
+    end
+
+    it 'should accept and convert a PNG to right size' do
         data = load_file_fixture("parrot.png")
         profile_photo = ProfilePhoto.new(:data => data, :user => @mock_user)
         profile_photo.valid?.should == true
@@ -35,7 +43,7 @@ describe ProfilePhoto, "when constructing a new photo" do
         profile_photo.image.rows.should == 96
     end
 
-    it 'should accept and convert a JPEG to right format and size' do 
+    it 'should accept and convert a JPEG to right format and size' do
         data = load_file_fixture("parrot.jpg")
         profile_photo = ProfilePhoto.new(:data => data, :user => @mock_user)
         profile_photo.valid?.should == true
@@ -44,7 +52,7 @@ describe ProfilePhoto, "when constructing a new photo" do
         profile_photo.image.rows.should == 96
     end
 
-    it 'should accept a draft PNG and not resize it' do 
+    it 'should accept a draft PNG and not resize it' do
         data = load_file_fixture("parrot.png")
         profile_photo = ProfilePhoto.new(:data => data, :draft => true)
         profile_photo.valid?.should == true
@@ -53,6 +61,6 @@ describe ProfilePhoto, "when constructing a new photo" do
         profile_photo.image.rows.should == 289
     end
 
-     
+
 end