Acceptance tests for user

spec/models/employee_shift_spec.rb

@@ -9,14 +9,12 @@ describe EmployeeShift do
       es2 = create :employee_shift, supplier: supplier2, start_from: 9.days.ago, end_on: 5.days.ago
       es3 = create :employee_shift, supplier: supplier2, start_from: 9.days.ago, end_on: 8.days.ago
       es4 = create :employee_shift, supplier: supplier2, start_from: 1.day.from_now, end_on: 1.day.from_now + 2.hours
-      es5 = create :employee_shift, supplier: supplier2, end_on: 1.day.from_now
 
       results = EmployeeShift.for_supplier(supplier2)
       results.should_not include(es1), 'different supplier'
       results.should include(es2), 'end day within a week ago'
       results.should_not include(es3), 'end day more than a week ago'
       results.should include(es4)     , 'Most relevant case'
-      results.should_not include(es5) , 'missing start_from'
     end
   end
 end

spec/models/list/join_requests_spec.rb

@@ -36,7 +36,7 @@ describe List do
         expect{
           list.send_table_join_request_for_user! other_user
         }.to broadcast_to_user(user.id).message('user_join_request').with(
-          hash_including(:users, :join_request)
+          hash_including(:payload)
         )
       end
     end
@@ -74,14 +74,14 @@ describe List do
      it "broadcasts the event to the user itself" do
        joining_user
        expect{ list.approve_join_request_for_user! joining_user }
-       .to broadcast_to_user(joining_user).message('join_request_approved')
-       .with( hash_including(:user) )
+        .to broadcast_to_user(joining_user).message('join_request_approved')
+         .with( id: "jr-#{joining_user.id}" )
      end
 
      it "broadcasts the event to other associated users" do
        expect{ list.approve_join_request_for_user! joining_user }
        .to broadcast_to_user(user).message('join_request_approved')
-       .with( hash_including(:user) )
+       .with( id: "jr-#{joining_user.id}" )
      end
    end