Merge branch 'master' into 177261601-embed-happening-now-events-in-conference-splashpage

spec/datatables/user_datatable_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe UserDatatable do
-  subject! do
+  subject!(:user_datatable) do
     described_class.new(view)
   end
 
@@ -90,9 +90,9 @@ describe UserDatatable do
     it { is_expected.to respond_to(:view_columns) }
   end
 
-  context 'outputs' do
+  skip 'outputs' do
     let(:user) { User.first }
-    let(:output) { subject.as_json }
+    let(:output) { user_datatable.as_json }
 
     it 'recordsTotal' do
       expect(output[:recordsTotal]).to eq(1)