From fa5f27d17fe3615b4182334e9d13df322f672773 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 9 Jul 2018 15:17:23 -0400 Subject: [PATCH 1/6] remove outdated #home test --- spec/controllers/rooms_controller_spec.rb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/spec/controllers/rooms_controller_spec.rb b/spec/controllers/rooms_controller_spec.rb index 90fc9893..bdc73119 100644 --- a/spec/controllers/rooms_controller_spec.rb +++ b/spec/controllers/rooms_controller_spec.rb @@ -170,20 +170,4 @@ describe RoomsController, type: :controller do expect(response).to redirect_to(root_path) end end - - describe "POST #home" do - before do - @user = create(:user) - @secondary_room = create(:room, owner: @user) - end - - it "should change users home room" do - @request.session[:user_id] = @user.id - post :home, params: { room_uid: @secondary_room } - @user.reload - - expect(@user.main_room).to eql(@secondary_room) - expect(response).to redirect_to(@secondary_room) - end - end end From 3b985a6dbb8979f4400893f93f5f171392054423 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 9 Jul 2018 16:10:11 -0400 Subject: [PATCH 2/6] add travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..297fea54 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: ruby +rvm: + - 2.5.1 From 19ffe483c6ebf3769172e48cef41ccee95060ef0 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 9 Jul 2018 16:41:49 -0400 Subject: [PATCH 3/6] add rubocop to travis config --- .travis.yml | 3 +++ Gemfile | 6 +++--- README.md | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 297fea54..4715c7be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: ruby rvm: - 2.5.1 + +script: + - bundle exec rubocop diff --git a/Gemfile b/Gemfile index 45513eed..538c9b49 100644 --- a/Gemfile +++ b/Gemfile @@ -58,9 +58,6 @@ gem 'tabler-rubygem' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development -# Ruby linting. -gem 'rubocop', require: false - group :production do # Use a postgres database in production. gem 'pg', '~> 0.18' @@ -82,6 +79,9 @@ group :test do gem 'shoulda-matchers', '~> 3.1' gem 'faker' gem "factory_bot_rails" + + # Ruby linting. + gem 'rubocop' end group :development do diff --git a/README.md b/README.md index fbdda367..e826dfa2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Travis](https://travis-ci.org/bigbluebutton/greenlight.svg?branch=master) + # Greenlight Greenlight is currently on version 2.0. If you are still running Greenlight 1.0 we suggest [upgrading to 2.0](http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10). From 6b118ce933a07b1d9431e2f1a58527ca0561b4a2 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 9 Jul 2018 16:59:20 -0400 Subject: [PATCH 4/6] exclude vendor from rubocop --- .rubocop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.rubocop.yml b/.rubocop.yml index 9af7d156..c249f85a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,7 @@ AllCops: Exclude: - 'db/schema.rb' + - 'vendor/**/*' DisabledByDefault: true TargetRubyVersion: 2.5 From 51c3ae9807d9930b298fe9a8b3a752baac19ce10 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 10 Jul 2018 11:54:19 -0400 Subject: [PATCH 5/6] add slack notifications and deploy to travis --- .travis.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4715c7be..131f0074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,29 @@ +sudo: required + language: ruby + +services: + - docker + rvm: - 2.5.1 script: - bundle exec rubocop + - docker build -t bigbluebutton/greenlight:master . + +after_script: + - docker images + +before_deploy: + - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS" + +deploy: + provider: script + script: docker push bigbluebutton/greenlight:master + on: + branch: master + +notifications: + slack: + secure: SSt7FJExMkQ5jLfLMSZzF+I3OHK+nohFXDqf5JtxnH+ql4F70QphClPmJrXg6/AuokLQwWU1QE66EBkjq0dWf+4yQPyKH450fBznqz3el7ybnItuTcOnK4F/F5nt9ekYhXUZ4UJSKiyZbNp8RIjBFcxDQyn8+zX+etTMRW+Dfulj6It9jweqv1/Qm4H9KyJeGLWDdyNOz8yXkKVBGe4uXATXbYUoZtEBwg5JDuK9g2suHqn+si6br7cSySMpJTEoyid72V5FtxK1bh59Uv9Ok+x0X4ruCwwiIT4DJt7l3G2Cq1hGdJE70WiPJQ2MoFKDsM1Mkcbf22CGCYLy/t1JqNoNElpvA4xRM6qi837Bq1s3gtFo4DTPX6FOWDdSe7fOZNCSVZbc/zmnAvO8v9U2z9PpckrtQA/mG16wsLlJh304iuP+I+h7kil7ur5x9TDG+10sP6+mhqk7g2X4ZDfvt0zBDiV8DKK64CYmLO+hyZl9jkPTVqS8twNXclV31wWgN4txiuTRAE2Bbd9b+3tDGzDqBYkLAgMg08sCunxtJQgUWnhf4NJTmdGXLrab4C9SfilL0QgzqQ6lP97F5CMopXgjf5u1tMtbCq7ExVVS6SS2AtLWC8YEaW4hGlaD2acO9JgWXRrhqvtDS3RtXwJ46bHnfK5MUInpcw6nHBoto+w= From 047edbd6e850cb716d208e08afa84b435bf8727f Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 10 Jul 2018 14:52:58 -0400 Subject: [PATCH 6/6] disable travis email notifications --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 131f0074..2822b1bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,6 @@ deploy: branch: master notifications: + email: false slack: secure: SSt7FJExMkQ5jLfLMSZzF+I3OHK+nohFXDqf5JtxnH+ql4F70QphClPmJrXg6/AuokLQwWU1QE66EBkjq0dWf+4yQPyKH450fBznqz3el7ybnItuTcOnK4F/F5nt9ekYhXUZ4UJSKiyZbNp8RIjBFcxDQyn8+zX+etTMRW+Dfulj6It9jweqv1/Qm4H9KyJeGLWDdyNOz8yXkKVBGe4uXATXbYUoZtEBwg5JDuK9g2suHqn+si6br7cSySMpJTEoyid72V5FtxK1bh59Uv9Ok+x0X4ruCwwiIT4DJt7l3G2Cq1hGdJE70WiPJQ2MoFKDsM1Mkcbf22CGCYLy/t1JqNoNElpvA4xRM6qi837Bq1s3gtFo4DTPX6FOWDdSe7fOZNCSVZbc/zmnAvO8v9U2z9PpckrtQA/mG16wsLlJh304iuP+I+h7kil7ur5x9TDG+10sP6+mhqk7g2X4ZDfvt0zBDiV8DKK64CYmLO+hyZl9jkPTVqS8twNXclV31wWgN4txiuTRAE2Bbd9b+3tDGzDqBYkLAgMg08sCunxtJQgUWnhf4NJTmdGXLrab4C9SfilL0QgzqQ6lP97F5CMopXgjf5u1tMtbCq7ExVVS6SS2AtLWC8YEaW4hGlaD2acO9JgWXRrhqvtDS3RtXwJ46bHnfK5MUInpcw6nHBoto+w=