Merge https://github.com/bigbluebutton/greenlight

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
 

app/views/shared/components/_recording_row.html.erb

@@ -38,7 +38,7 @@
     <div class="small text-muted text-uppercase">
       <%= t("recording.table.users") %>
     </div>
-    <%= recording[:participants] %>
+    <%= recording[:participants] || "-" %>
   </td>
   <td class="text-left">
     <div class="dropdown">

config/initializers/version.rb

@@ -2,6 +2,6 @@
 
 module Greenlight
   class Application
-    VERSION = "2.1.0"
+    VERSION = "2.0.0"
   end
 end

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