lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Complete refactor of Gemfile and upgraded gems (#2553)

Browse Source
This commit is contained in:
Ahmad Farhat
2021-02-26 17:34:07 -05:00
committed by GitHub
parent c5b00e89aa
commit 09ab074aaf
29 changed files with 327 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spec/controllers/rooms_controller_spec.rb
View File

@ -182,8 +182,8 @@ describe RoomsController, type: :controller do
@request.session[:user_id] = @owner.id
name = Faker::Games::Pokemon.name
room_params = { name: name, "mute_on_join": "1",
"require_moderator_approval": "1", "anyone_can_start": "1", "all_join_moderator": "1" }
room_params = { name: name, mute_on_join: "1",
require_moderator_approval: "1", anyone_can_start: "1", all_join_moderator: "1" }
json_room_settings = "{\"muteOnStart\":true,\"requireModeratorApproval\":true," \
"\"anyoneCanStart\":true,\"joinModerator\":true,\"recording\":false}"
@ -199,8 +199,8 @@ describe RoomsController, type: :controller do
it "should respond with JSON object of the room_settings" do
@request.session[:user_id] = @owner.id
@owner.main_room.update_attribute(:room_settings, { "muteOnStart": true, "requireModeratorApproval": true,
"anyoneCanStart": true, "joinModerator": true }.to_json)
@owner.main_room.update_attribute(:room_settings, { muteOnStart: true, requireModeratorApproval: true,
anyoneCanStart: true, joinModerator: true }.to_json)
json_room_settings = { "anyoneCanStart" => true,
"joinModerator" => true,
@ -224,7 +224,7 @@ describe RoomsController, type: :controller do
it "should redirect back to main room with error if it fails" do
@request.session[:user_id] = @owner.id
room_params = { name: "", "mute_on_join": "1" }
room_params = { name: "", mute_on_join: "1" }
post :create, params: { room: room_params }
@ -237,7 +237,7 @@ describe RoomsController, type: :controller do
@request.session[:user_id] = @owner.id
room_params = { name: Faker::Games::Pokemon.name, "mute_on_join": "1" }
room_params = { name: Faker::Games::Pokemon.name, mute_on_join: "1" }
post :create, params: { room: room_params }
@ -583,7 +583,7 @@ describe RoomsController, type: :controller do
@request.session[:user_id] = @user.id
name = Faker::Name.first_name
room_params = { room_uid: @secondary_room.uid, room: { "name": name } }
room_params = { room_uid: @secondary_room.uid, room: { name: name } }
expect { post :update_settings, params: room_params }.to change { @secondary_room.reload.name }
.from(@secondary_room.name).to(name)
@ -593,7 +593,7 @@ describe RoomsController, type: :controller do
it "properly updates room settings through the room settings modal and redirects to current page" do
@request.session[:user_id] = @user.id
room_params = { "mute_on_join": "1", "name": @secondary_room.name, "recording": "1" }
room_params = { mute_on_join: "1", name: @secondary_room.name, recording: "1" }
formatted_room_params = "{\"muteOnStart\":true,\"requireModeratorApproval\":false," \
"\"anyoneCanStart\":false,\"joinModerator\":false,\"recording\":true}" # JSON string format
@ -616,7 +616,7 @@ describe RoomsController, type: :controller do
@admin.set_role :admin
@request.session[:user_id] = @admin.id
room_params = { "mute_on_join": "1", "name": @secondary_room.name }
room_params = { mute_on_join: "1", name: @secondary_room.name }
formatted_room_params = "{\"muteOnStart\":true,\"requireModeratorApproval\":false," \
"\"anyoneCanStart\":false,\"joinModerator\":false,\"recording\":false}" # JSON string format
@ -632,7 +632,7 @@ describe RoomsController, type: :controller do
@admin.set_role :admin
@request.session[:user_id] = @admin.id
room_params = { "mute_on_join": "1", "name": @secondary_room.name }
room_params = { mute_on_join: "1", name: @secondary_room.name }
expect { post :update_settings, params: { room_uid: @secondary_room.uid, room: room_params } }
.not_to change { @secondary_room.reload.room_settings }

6
spec/controllers/users_controller_spec.rb
View File

@ -416,7 +416,7 @@ describe UsersController, type: :controller do
tmp_role1.update_permission("send_promoted_email", "true")
params = random_valid_user_params
params = params.merge!(user_uid: user, user: { role_id: tmp_role1.id.to_s })
params.merge!(user_uid: user, user: { role_id: tmp_role1.id.to_s })
expect { post :update, params: params }.to change { ActionMailer::Base.deliveries.count }.by(1)
@ -440,7 +440,7 @@ describe UsersController, type: :controller do
@request.session[:user_id] = admin.id
params = random_valid_user_params
params = params.merge!(user_uid: user, user: { role_id: new_role.id.to_s })
params.merge!(user_uid: user, user: { role_id: new_role.id.to_s })
expect(user.role.name).to eq("test1")
expect(user.main_room).to be_nil
@ -503,7 +503,7 @@ describe UsersController, type: :controller do
user: {
password: "incorrect_password",
new_password: @password,
password_confirmation: @password + "_random_string",
password_confirmation: "#{@password}_random_string",
}
}
post :update_password, params: params.merge!(user_uid: @user)

14
spec/spec_helper.rb
View File

@ -54,27 +54,27 @@ RSpec.configure do |config|
.with(
headers:
{
'Accept': '*/*',
Accept: '*/*',
'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent': 'Ruby',
}
)
.to_return(status: 200, body: "", headers: {})
stub_request(:any, /#{ENV['LOADBALANCER_ENDPOINT'] + 'api'}/)
stub_request(:any, /#{"#{ENV['LOADBALANCER_ENDPOINT']}api"}/)
.with(
headers:
{
'Accept': '*/*',
Accept: '*/*',
'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent': 'Ruby',
}
)
.to_return(status: 200, body: "", headers: {}) if ENV['LOADBALANCER_ENDPOINT']
stub_request(:any, /#{ENV['LOADBALANCER_ENDPOINT'] + 'api\/getUser'}/)
stub_request(:any, /#{"#{ENV['LOADBALANCER_ENDPOINT']}api\\/getUser"}/)
.with(
headers:
{
'Accept': '*/*',
Accept: '*/*',
'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent': 'Ruby',
}
@ -90,11 +90,11 @@ RSpec.configure do |config|
<secret>secret</secret>
</user>
</response>", headers: {}) if ENV['LOADBALANCER_ENDPOINT']
stub_request(:any, /#{ENV['LOADBALANCER_ENDPOINT'] + 'api2\/getUserGreenlightCredentials'}/)
stub_request(:any, /#{"#{ENV['LOADBALANCER_ENDPOINT']}api2\\/getUserGreenlightCredentials"}/)
.with(
headers:
{
'Accept': '*/*',
Accept: '*/*',
'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
'User-Agent': 'Ruby',
}