diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index bf5d125e..9342506a 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -8,7 +8,7 @@ describe Admin::UsersController do sign_in(admin) end describe 'GET #index' do - xit 'sets up users array with existing users records' do + it 'sets up users array with existing users records' do user1 = create(:user, email: 'user1@email.osem') user2 = create(:user, email: 'user2@email.osem') user_deleted = User.find_by!(username: 'deleted_user') diff --git a/spec/datatables/user_datatable_spec.rb b/spec/datatables/user_datatable_spec.rb index 33d2d4d7..23d660db 100644 --- a/spec/datatables/user_datatable_spec.rb +++ b/spec/datatables/user_datatable_spec.rb @@ -95,22 +95,18 @@ describe UserDatatable do let(:output) { subject.as_json } it 'recordsTotal' do - skip('This fails since Ruby 2.5.8') expect(output[:recordsTotal]).to eq(1) end it 'recordsFiltered' do - skip('This fails since Ruby 2.5.8') expect(output[:recordsFiltered]).to eq(1) end it 'data length' do - skip('This fails since Ruby 2.5.8') expect(output[:data].length).to eq(1) end it 'has expected data columns' do - skip('This fails since Ruby 2.5.8') expect(output[:data].first.keys).to eq(data_cols) end @@ -118,32 +114,26 @@ describe UserDatatable do let(:user_data) { output[:data].first } it 'id' do - skip('This fails since Ruby 2.5.8') expect(user_data[:id].to_i).to eq(user.id) end it 'name' do - skip('This fails since Ruby 2.5.8') expect(user_data[:name]).to eq(user.name) end it 'email' do - skip('This fails since Ruby 2.5.8') expect(user_data[:email]).to eq(user.email) end it 'confirmed_at' do - skip('This fails since Ruby 2.5.8') expect(Date.parse(user_data[:confirmed_at])).to eq(user.confirmed_at.to_date) end it 'attended' do - skip('This fails since Ruby 2.5.8') expect(user_data[:attended].to_i).to eq(user.attended_count) end it 'roles' do - skip('This fails since Ruby 2.5.8') expect(user_data[:roles]).to eq('None') end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 9c87238b..ec2e4060 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -430,7 +430,7 @@ describe User do end describe 'assigns admin attribute' do - xit 'to second user when first user is deleted_user' do + it 'to second user when first user is deleted_user' do deleted_user = User.find_by(email: 'deleted@localhost.osem') expect(deleted_user.is_admin).to be false