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 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..2822b1bf --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +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: + 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= diff --git a/Gemfile b/Gemfile index b70263a9..c5857dc5 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' @@ -83,6 +80,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). 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