Merge pull request #3080 from raydavis/raywip

CLC-4363 Handle empty RegBlocks body in My Activities

Author: johncrossman

app/models/my_activities/reg_blocks.rb

@@ -4,13 +4,15 @@ class RegBlocks
     def self.append!(uid, activities)
       blocks_feed = Bearfacts::Regblocks.new({user_id: uid}).get
       if blocks_feed[:errored] || blocks_feed[:noStudentId]
-        return activities
+        return
       end
 
       %w(activeBlocks inactiveBlocks).each do |block_category|
-        blocks_feed[block_category.to_sym].each do |block|
-          notification = process_block!(block)
-          activities << notification if notification.present?
+        if (blocks = blocks_feed[block_category.to_sym])
+          blocks.each do |block|
+            notification = process_block!(block)
+            activities << notification if notification.present?
+          end
         end
       end
     end

spec/models/my_activities/reg_blocks_spec.rb

@@ -66,4 +66,13 @@
       activities.should eq('foo')
     end
   end
+
+  context 'nil body from proxy' do
+    before { allow_any_instance_of(Bearfacts::Regblocks).to receive(:get).and_return({}) }
+    it 'should not do anything' do
+      activities = []
+      MyActivities::RegBlocks.append!(oski_uid, activities)
+      expect(activities).to eq []
+    end
+  end
 end