rspec passes cleanly now

Author: dsjoerg

app/models/user.rb

@@ -134,9 +134,8 @@ def to_builder(builder = nil)
     builder.pro(self.pro?)
 
     # Assocations.
-    # I tried doing a nice send(), but Jbuilder freaks out for some reason.
-    builder.accounts(accounts) {|json, account| account.to_builder(json)}
-    builder.notifications(notifications) {|json, notification| notification.to_builder(json)}
+    builder.accounts(accounts) {|account| account.to_builder(builder)}
+    builder.notifications(notifications) {|notification| notification.to_builder(builder)}
 
     builder
   end

spec/controllers/esdb_controller_spec.rb

@@ -3,6 +3,10 @@
 describe EsdbController do
   describe :callback do
     it 'should identify and update a replay by esdb job id for replay_progress' do
+      if Rails.configuration.s3['replays']['access_key_id'] == 'YOUR_ACCESS_KEY'
+        pending("can't test this without configuring Amazon S3")
+      end
+
       replay = FactoryGirl.create(:replay)
       replay.uploaded!
 
@@ -18,6 +22,10 @@
     end
 
     it 'should identify and update a replay by esdb job id for replay_error' do
+      if Rails.configuration.s3['replays']['access_key_id'] == 'YOUR_ACCESS_KEY'
+        pending("can't test this without configuring Amazon S3")
+      end
+
       replay = FactoryGirl.create(:replay)
       replay.uploaded!
 
@@ -29,6 +37,10 @@
 
     # TODO: might want a replay_done callback or something instead, not sure yet.
     it 'should set the replay status to parsing/done when progress reaches 100%' do
+      if Rails.configuration.s3['replays']['access_key_id'] == 'YOUR_ACCESS_KEY'
+        pending("can't test this without configuring Amazon S3")
+      end
+
       replay = FactoryGirl.create(:replay)
       replay.uploaded!
 
@@ -38,4 +50,4 @@
       replay.state.should == 'done'
     end
   end
-end
+end

spec/controllers/replays_controller_spec.rb

@@ -21,6 +21,10 @@
     # about uploads, we never want them to fail.
     # TODO: add tests that demonstrate this better (duplicate replays, etc.)
     it 'should create the replay' do
+      if Rails.configuration.s3['replays']['access_key_id'] == 'YOUR_ACCESS_KEY'
+        pending("can't test this without configuring Amazon S3")
+      end
+
       post :drop, :replay => Rack::Test::UploadedFile.new(@replay_file)
 
       response.status.should == 201 # created
@@ -34,6 +38,10 @@
     # the upload has been a success and inform the user we're not waiting to
     # process the replay.
     it 'should create the replay with 100% progress' do
+      if Rails.configuration.s3['replays']['access_key_id'] == 'YOUR_ACCESS_KEY'
+        pending("can't test this without configuring Amazon S3")
+      end
+
       post :drop, :replay => Rack::Test::UploadedFile.new(@replay_file)
 
       response.status.should == 201 # created

spec/models/user_spec.rb

@@ -8,38 +8,19 @@
   it 'should serialize via jbuilder correctly' do
     expected_keys = [:email, :password, :password_confirmation, :remember_me, :handle]
 
-    user = User.new
+    user = FactoryGirl.create(:user)
     hash = user.to_builder.attributes!
 
     expected_keys.each do |xk|
       hash[xk.to_s].should == user.send(xk)
     end
-    
+
     hash['accounts'].should_not be_nil
-    # hash['replays'].should_not be_nil
     hash['notifications'].should_not be_nil
-  end
 
-  # Handle not required/used anymore currentl
-
-  # it 'should require a handle' do
-  #   user = User.new
-  #   user.handle = nil
-  #   user.valid?.should == false
-  # end
-
-  # it 'should validate the handle to be alphanumeric, mostly' do
-  #   user = FactoryGirl.build(:user)
-  # 
-  #   user.handle = 'EG_IdrA2012'
-  #   user.valid?.should == true
-  # 
-  #   user.handle = 'I pwnz Whitespace'
-  #   user.valid?.should == false
-  # 
-  #   user.handle = 'WHO$)§WOULD%/§DO*THIS*?'
-  #   user.valid?.should == false
-  # end
+    hash['accounts'][0].keys.length.should == 23
+    hash['notifications'][0].keys.length.should == 6
+  end
 
   it 'should require an email' do
     user = User.new