Skip to content
Snippets Groups Projects
Commit 317e6e8c authored by bruckwubete's avatar bruckwubete
Browse files

update to add github trigger

parent 810b62f6
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,12 @@ if (env.TAG_NAME && env.TAG_NAME.contains("release")) { ...@@ -11,6 +11,12 @@ if (env.TAG_NAME && env.TAG_NAME.contains("release")) {
kubecSecretsId = 'gl-launcher-staging-secrets' kubecSecretsId = 'gl-launcher-staging-secrets'
} }
properties([
pipelineTriggers([
githubPush()
])
])
podTemplate(label: label, cloud: "${kubeCloud}", containers: [ podTemplate(label: label, cloud: "${kubeCloud}", containers: [
containerTemplate(name: 'ruby', image: "ruby:2.5.1", command: 'cat', ttyEnabled: true), containerTemplate(name: 'ruby', image: "ruby:2.5.1", command: 'cat', ttyEnabled: true),
containerTemplate(name: 'gcloud', image: "gcr.io/ci-cd-for-bn/gcloud-docker", command: 'cat', ttyEnabled: true), containerTemplate(name: 'gcloud', image: "gcr.io/ci-cd-for-bn/gcloud-docker", command: 'cat', ttyEnabled: true),
...@@ -31,7 +37,7 @@ volumes: [ ...@@ -31,7 +37,7 @@ volumes: [
stage('Test') { stage('Test') {
container('ruby') { container('ruby') {
sh "bundle install && bundle exec rubocop && bundle exec rspec" sh "bundle install --without development production && bundle exec rubocop && bundle exec rspec"
} }
} }
......
...@@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base ...@@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base
before_action :set_locale before_action :set_locale
# Force SSL for loadbalancer configurations. # Force SSL for loadbalancer configurations.
before_filter :redirect_to_https before_action :redirect_to_https
protect_from_forgery with: :exception protect_from_forgery with: :exception
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="small text-muted text-uppercase"> <div class="small text-muted text-uppercase">
<%= t("recording.table.users") %> <%= t("recording.table.users") %>
</div> </div>
<%= recording[:participants] %> <%= recording[:participants] || "-" %>
</td> </td>
<td class="text-left"> <td class="text-left">
<div class="dropdown"> <div class="dropdown">
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
module Greenlight module Greenlight
class Application class Application
VERSION = "2.1.0" VERSION = "2.0.0"
end end
end end
...@@ -43,6 +43,8 @@ describe UsersController, type: :controller do ...@@ -43,6 +43,8 @@ describe UsersController, type: :controller do
end end
describe "GET #new" do 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 it "assigns a blank user to the view" do
get :new get :new
expect(assigns(:user)).to be_a_new(User) expect(assigns(:user)).to be_a_new(User)
...@@ -50,7 +52,10 @@ describe UsersController, type: :controller do ...@@ -50,7 +52,10 @@ describe UsersController, type: :controller do
end end
describe "POST #create" do describe "POST #create" do
it "redirects to user room on succesful create" do context "allow greenlight accounts" do
before { allow(Rails.configuration).to receive(:allow_user_signup).and_return(true) }
it "redirects to user room on successful create" do
params = random_valid_user_params params = random_valid_user_params
post :create, params: params post :create, params: params
...@@ -61,14 +66,6 @@ describe UsersController, type: :controller do ...@@ -61,14 +66,6 @@ describe UsersController, type: :controller do
expect(response).to redirect_to(room_path(u.main_room)) expect(response).to redirect_to(room_path(u.main_room))
end end
it "redirects to main room if already authenticated" do
user = create(:user)
@request.session[:user_id] = user.id
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 it "user saves with greenlight provider" do
params = random_valid_user_params params = random_valid_user_params
post :create, params: params post :create, params: params
...@@ -85,6 +82,28 @@ describe UsersController, type: :controller do ...@@ -85,6 +82,28 @@ describe UsersController, type: :controller do
end end
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
user = create(:user)
@request.session[:user_id] = user.id
post :create, params: random_valid_user_params
expect(response).to redirect_to(room_path(user.main_room))
end
end
describe "PATCH #update" do describe "PATCH #update" do
it "properly updates user attributes" do it "properly updates user attributes" do
user = create(:user) user = create(:user)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment