Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
milestruecar committed Aug 7, 2023
2 parents 8e3706a + 2d174c6 commit 85e6c9b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions spec/slack/real_time/concurrency/clients/async_spec.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# frozen_string_literal: true
require 'spec_helper'

RSpec.describe Slack::RealTime::Concurrency::Async::Socket, if: ENV['CONCURRENCY'] == 'async-websocket' do
RSpec.describe 'Slack::RealTime::Concurrency::Async::Socket', skip: (
ENV['CONCURRENCY'] != 'async-websocket'
) do
context 'global config' do
let(:client) { described_class.new(nil) }
let(:client) { Slack::RealTime::Concurrency::Async::Socket.new(nil) }

context 'run_async' do
it 'returns an Async::Task' do
Expand Down

0 comments on commit 85e6c9b

Please sign in to comment.