Merge pull request #28 from rootstrap/fix-dependencies

Fix dependencies and tests

Author: santib

.gitignore

@@ -12,3 +12,4 @@ spec/tmp/
 node_modules/
 /coverage/
 Gemfile.lock
+gemfiles/*.lock

.rubocop.yml

@@ -30,6 +30,7 @@ Metrics/BlockLength:
   Exclude:
     - spec/generators/install_generator_spec.rb
     - lib/active_admin_chat/active_admin/application.rb
+    - active_admin_chat.gemspec
   ExcludedMethods: ['describe', 'context', 'feature', 'scenario']
 
 Metrics/BlockNesting:

.travis.yml

@@ -11,7 +11,11 @@ rvm:
   - 2.5.3
   - ruby-head
 
-sudo: required
+addons:
+  chrome: stable
+
+dist: xenial
+os: linux
 
 before_install:
   - bundle install
@@ -30,7 +34,7 @@ gemfile:
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
 
-matrix:
+jobs:
   fast_finish: true
   exclude:
     - gemfile: gemfiles/5.2.gemfile

active_admin_chat.gemspec

@@ -20,18 +20,19 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activeadmin', '>= 1.0.0'
   s.add_dependency 'rails', '>= 5.0.0'
+  s.add_dependency 'sassc-rails', '~> 2.1.2'
 
-  s.add_development_dependency 'action-cable-testing'
-  s.add_development_dependency 'byebug'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_bot_rails'
-  s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'puma'
+  s.add_development_dependency 'action-cable-testing', '~> 0.4.0'
+  s.add_development_dependency 'byebug', '~> 10.0.0'
+  s.add_development_dependency 'capybara', '~> 3.1.1'
+  s.add_development_dependency 'database_cleaner', '~> 1.8.4'
+  s.add_development_dependency 'factory_bot_rails', '~> 4.11.1'
+  s.add_development_dependency 'generator_spec', '~> 0.9.4'
+  s.add_development_dependency 'puma', '~> 4.3.3'
   s.add_development_dependency 'rspec-rails', '~> 3.8'
   s.add_development_dependency 'rubocop', '~> 0.59.2'
-  s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'selenium-webdriver', '~> 3.0'
+  s.add_development_dependency 'simplecov', '~> 0.17.1'
+  s.add_development_dependency 'sqlite3', '~> 1.4.0'
+  s.add_development_dependency 'timecop', '~> 0.9.1'
 end

gemfiles/5.0.gemfile

@@ -2,19 +2,20 @@ source 'https://rubygems.org'
 
 gem 'activeadmin', '~> 1.0.0'
 gem 'rails', '~> 5.0.0'
+gem 'sassc-rails', '~> 2.1.2'
 
 group :development, :test do
-  gem 'action-cable-testing'
-  gem 'byebug'
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'factory_bot_rails'
-  gem 'generator_spec'
-  gem 'puma'
+  gem 'action-cable-testing', '~> 0.4.0'
+  gem 'byebug', '~> 10.0.0'
+  gem 'capybara', '~> 3.1.1'
+  gem 'database_cleaner', '~> 1.8.4'
+  gem 'factory_bot_rails', '~> 4.11.1'
+  gem 'generator_spec', '~> 0.9.4'
+  gem 'puma', '~> 4.3.3'
   gem 'rspec-rails', '~> 3.8'
   gem 'rubocop', '~> 0.59.2'
-  gem 'selenium-webdriver'
-  gem 'simplecov'
-  gem 'sqlite3'
-  gem 'timecop'
+  gem 'selenium-webdriver', '~> 3.0'
+  gem 'simplecov', '~> 0.17.1'
+  gem 'sqlite3', '~> 1.3.0'
+  gem 'timecop', '~> 0.9.1'
 end

gemfiles/5.1.gemfile

@@ -2,19 +2,20 @@ source 'https://rubygems.org'
 
 gem 'activeadmin', '~> 1.2.1'
 gem 'rails', '~> 5.1.0'
+gem 'sassc-rails', '~> 2.1.2'
 
 group :development, :test do
-  gem 'action-cable-testing'
-  gem 'byebug'
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'factory_bot_rails'
-  gem 'generator_spec'
-  gem 'puma'
+  gem 'action-cable-testing', '~> 0.4.0'
+  gem 'byebug', '~> 10.0.0'
+  gem 'capybara', '~> 3.1.1'
+  gem 'database_cleaner', '~> 1.8.4'
+  gem 'factory_bot_rails', '~> 4.11.1'
+  gem 'generator_spec', '~> 0.9.4'
+  gem 'puma', '~> 4.3.3'
   gem 'rspec-rails', '~> 3.8'
   gem 'rubocop', '~> 0.59.2'
-  gem 'selenium-webdriver'
-  gem 'simplecov'
-  gem 'sqlite3'
-  gem 'timecop'
+  gem 'selenium-webdriver', '~> 3.0'
+  gem 'simplecov', '~> 0.17.1'
+  gem 'sqlite3', '~> 1.3.0'
+  gem 'timecop', '~> 0.9.1'
 end

gemfiles/5.2.gemfile

@@ -2,19 +2,20 @@ source 'https://rubygems.org'
 
 gem 'activeadmin', '~> 1.4.3'
 gem 'rails', '~> 5.2.0'
+gem 'sassc-rails', '~> 2.1.2'
 
 group :development, :test do
-  gem 'action-cable-testing'
-  gem 'byebug'
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'factory_bot_rails'
-  gem 'generator_spec'
-  gem 'puma'
+  gem 'action-cable-testing', '~> 0.4.0'
+  gem 'byebug', '~> 10.0.0'
+  gem 'capybara', '~> 3.1.1'
+  gem 'database_cleaner', '~> 1.8.4'
+  gem 'factory_bot_rails', '~> 4.11.1'
+  gem 'generator_spec', '~> 0.9.4'
+  gem 'puma', '~> 4.3.3'
   gem 'rspec-rails', '~> 3.8'
   gem 'rubocop', '~> 0.59.2'
-  gem 'selenium-webdriver'
-  gem 'simplecov'
-  gem 'sqlite3'
-  gem 'timecop'
+  gem 'selenium-webdriver', '~> 3.0'
+  gem 'simplecov', '~> 0.17.1'
+  gem 'sqlite3', '~> 1.3.0'
+  gem 'timecop', '~> 0.9.1'
 end

spec/channels/chat_channel_spec.rb

@@ -39,7 +39,7 @@
         subscribe(conversation_id: conversation.id)
 
         expect(subscription).to be_confirmed
-        expect(streams).to eq(["chat:#{conversation.to_gid_param}"])
+        expect(subscription).to have_stream_for(conversation)
       end
 
       it 'broadcasts a message' do
@@ -95,15 +95,15 @@
         subscribe
 
         expect(subscription).to be_confirmed
-        expect(streams).to eq(["chat:#{conversation.to_gid_param}"])
+        expect(subscription).to have_stream_for(conversation)
       end
 
       it "subscribes to the user's conversation stream ignoring the conversation_id" do
         other_conversation = create(:conversation)
         subscribe(conversation_id: other_conversation.id)
 
         expect(subscription).to be_confirmed
-        expect(streams).to eq(["chat:#{conversation.to_gid_param}"])
+        expect(subscription).to have_stream_for(conversation)
       end
 
       it 'broadcasts a message' do

spec/rails_helper.rb

@@ -34,18 +34,14 @@
 #
 # Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
-Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome)
-end
-
 Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless no-sandbox disable-gpu] }
-  )
+  options = Selenium::WebDriver::Chrome::Options.new(args: ['headless', 'disable-gpu'])
 
-  Capybara::Selenium::Driver.new app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    options: options
+  )
 end
 
 Capybara.javascript_driver = :headless_chrome