From 907b8e949ec626a01cd992bce854726a8f6400ea Mon Sep 17 00:00:00 2001 From: Bruck Wubete Date: Tue, 21 Aug 2018 08:04:41 -0800 Subject: [PATCH 1/5] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 52a9c505..c4c72315 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ volumes: [ stage('Test') { container('ruby') { - sh "bundle install && bundle exec rubocop && bundle exec rspec" + sh "bundle install && bundle exec rubocop && bundle exec rspec " } } From d7db798adc7ed5e7b4a83d9f7232294e2c0742af Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 21 Aug 2018 13:20:04 -0400 Subject: [PATCH 2/5] show placeholder when no participants field --- app/views/shared/components/_recording_row.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb index c567d771..b1489b53 100644 --- a/app/views/shared/components/_recording_row.html.erb +++ b/app/views/shared/components/_recording_row.html.erb @@ -38,7 +38,7 @@
<%= t("recording.table.users") %>
- <%= recording[:participants] %> + <%= recording[:participants] || "-" %>
From 71395003c13e7db40d0264221438439ef4c853fe Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 21 Aug 2018 13:28:56 -0400 Subject: [PATCH 3/5] revert version --- config/initializers/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/version.rb b/config/initializers/version.rb index 9cb791e3..9933426f 100644 --- a/config/initializers/version.rb +++ b/config/initializers/version.rb @@ -2,6 +2,6 @@ module Greenlight class Application - VERSION = "2.1.0" + VERSION = "2.0.0" end end From ba4b7a018e7755cb53944db521e12b9abcf15abb Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 21 Aug 2018 13:52:20 -0400 Subject: [PATCH 4/5] make user_controller tests not env dependent --- spec/controllers/users_controller_spec.rb | 63 +++++++++++++++-------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 0570036e..e546903f 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -43,6 +43,8 @@ describe UsersController, type: :controller do end describe "GET #new" do + before { allow(Rails.configuration).to receive(:allow_user_signup).and_return(true) } + it "assigns a blank user to the view" do get :new expect(assigns(:user)).to be_a_new(User) @@ -50,15 +52,47 @@ describe UsersController, type: :controller do end describe "POST #create" do - it "redirects to user room on succesful create" do - params = random_valid_user_params - post :create, params: params + context "allow greenlight accounts" do + before { allow(Rails.configuration).to receive(:allow_user_signup).and_return(true) } - u = User.find_by(name: params[:user][:name], email: params[:user][:email]) + it "redirects to user room on successful create" do + params = random_valid_user_params + post :create, params: params - expect(u).to_not be_nil - expect(u.name).to eql(params[:user][:name]) - expect(response).to redirect_to(room_path(u.main_room)) + u = User.find_by(name: params[:user][:name], email: params[:user][:email]) + + expect(u).to_not be_nil + expect(u.name).to eql(params[:user][:name]) + expect(response).to redirect_to(room_path(u.main_room)) + end + + it "user saves with greenlight provider" do + params = random_valid_user_params + post :create, params: params + + u = User.find_by(name: params[:user][:name], email: params[:user][:email]) + + expect(u.provider).to eql("greenlight") + end + + it "renders #new on unsuccessful save" do + post :create, params: invalid_params + + expect(response).to render_template(:new) + end + end + + context "disallow greenlight accounts" do + before { allow(Rails.configuration).to receive(:allow_user_signup).and_return(false) } + + it "redirect to root on attempted create" do + params = random_valid_user_params + post :create, params: params + + u = User.find_by(name: params[:user][:name], email: params[:user][:email]) + + expect(u).to be_nil + end end it "redirects to main room if already authenticated" do @@ -68,21 +102,6 @@ describe UsersController, type: :controller do post :create, params: random_valid_user_params expect(response).to redirect_to(room_path(user.main_room)) end - - it "user saves with greenlight provider" do - params = random_valid_user_params - post :create, params: params - - u = User.find_by(name: params[:user][:name], email: params[:user][:email]) - - expect(u.provider).to eql("greenlight") - end - - it "renders #new on unsuccessful save" do - post :create, params: invalid_params - - expect(response).to render_template(:new) - end end describe "PATCH #update" do From 81d460f1c282359d6595dbfe8b125c951da0f209 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 21 Aug 2018 14:54:52 -0400 Subject: [PATCH 5/5] fix before_filter deprecation warning --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a35b39a6..2176cbfb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base before_action :set_locale # Force SSL for loadbalancer configurations. - before_filter :redirect_to_https + before_action :redirect_to_https protect_from_forgery with: :exception