remove Thread context

takatama · takatama · commit 43ca5e218880 · 2023-07-16T23:27:39.000+09:00
diff --git a/spec/lib/event_service/providers/connpass_spec.rb b/spec/lib/event_service/providers/connpass_spec.rb
@@ -9,23 +9,16 @@
 
     it do
       expect(subject).to be_instance_of(Hash)
-      expect(subject['results_returned']).to eq 2
+      expect(subject['results_returned']).to eq 1
+      expect(subject['events'].size).to eq 1
       expect(subject['events'].first['event_id']).to eq 12345
       expect(subject['events'].first['series']['url']).to eq 'https://coderdojo-okutama.connpass.com/'
       expect(subject['events'].first['series']['id']).to eq 9876
-      expect(subject['events'].second['event_id']).to eq 12346 # assuming the second event has id 12346
-      expect(subject['events'].second['series']['url']).to eq 'https://coderdojo-okutama2.connpass.com/'
-      expect(subject['events'].second['series']['id']).to eq 9877
     end
 end
 
   describe '#fetch_events' do
     context 'when a single series_id is given' do
-      before do
-        # Thread.currentを使用してテストのコンテキスト間でデータを共有する
-        Thread.current[:series_ids] = [9876]
-      end
-
       subject { described_class.new.fetch_events(series_id: 9876) }
 
       it do
@@ -38,14 +31,8 @@
     end
 
     context 'when multiple series_ids are given' do
-      before do
-        # Thread.currentを使用してテストのコンテキスト間でデータを共有する
-        Thread.current[:series_ids] = [9876, 9877]
-      end
-
       subject { described_class.new.fetch_events(series_id: [9876, 9877]) }
 
-      # Here, you need to modify connpass_response to return multiple events for different series_ids
       it do
         expect(subject).to be_instance_of(Array)
         expect(subject.size).to eq 2
diff --git a/spec/support/shared_contexts/statistics.rb b/spec/support/shared_contexts/statistics.rb
@@ -4,7 +4,13 @@
       f.response :json, :content_type => /\bjson$/
       f.adapter :test, Faraday::Adapter::Test::Stubs.new do |stub|
         # connpass
-        stub.get('/event/') { connpass_response }
+        stub.get('/event/') do |env|
+          if env.params["series_id"] == '9876,9877'
+            multiple_series_ids_response
+          else
+            connpass_response
+          end
+        end
 
         # doorkeeper
         stub.get('/events') { doorkeeper_response }
@@ -21,22 +27,22 @@
 RSpec.shared_context 'Use stubs for Connpass' do
   include_context 'Use stub connection of Faraday'
 
+  # response for multiple series_ids 9876 and 9877
+  let(:multiple_series_ids_response) do
+    [
+      200,
+      { 'Content-Type' => 'application/json' },
+      '{"results_returned": 2, "events": [{"event_url": "https://coderdojo-okutama.connpass.com/event/12345/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama.connpass.com/", "id": 9876, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12345, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"},{"event_url": "https://coderdojo-okutama.connpass.com/event/12346/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama2.connpass.com/", "id": 9877, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12346, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"}], "results_start": 200, "results_available": 518}'
+    ]
+  end
+
+  # response for single series_id 9876, and for search
   let(:connpass_response) do
-    if Thread.current[:series_ids] == [9876]
-      # response for single series_id 9876
-      [
-        200,
-        { 'Content-Type' => 'application/json' },
-        '{"results_returned": 1, "events": [{"event_url": "https://coderdojo-okutama.connpass.com/event/12345/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama.connpass.com/", "id": 9876, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12345, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"}], "results_start": 200, "results_available": 518}'
-      ]
-    else
-      # response for multiple series_ids 9876 and 9877
-      [
-        200,
-        { 'Content-Type' => 'application/json' },
-        '{"results_returned": 2, "events": [{"event_url": "https://coderdojo-okutama.connpass.com/event/12345/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama.connpass.com/", "id": 9876, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12345, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"},{"event_url": "https://coderdojo-okutama.connpass.com/event/12346/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama2.connpass.com/", "id": 9877, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12346, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"}], "results_start": 200, "results_available": 518}'
-      ]
-    end
+    [
+      200,
+      { 'Content-Type' => 'application/json' },
+      '{"results_returned": 1, "events": [{"event_url": "https://coderdojo-okutama.connpass.com/event/12345/", "event_type": "participation", "owner_nickname": "nalabjp", "series": {"url": "https://coderdojo-okutama.connpass.com/", "id": 9876, "title": "CoderDojo series"}, "updated_at": "2017-04-29T14:59:30+09:00", "lat": "35.801763000000", "started_at": "2017-05-07T10:00:00+09:00", "hash_tag": "CoderDojo", "title": "CoderDojo title", "event_id": 12345, "lon": "139.087656000000", "waiting": 2, "limit": 10, "owner_id": 2525, "owner_display_name": "nalabjp", "description": "CoderDojo description", "address": "Okutama-cho Tokyo", "catch": "CoderDojo catch", "accepted": 10, "ended_at": "2017-05-07T12:00:00+09:00", "place": "Tokyo"}], "results_start": 200, "results_available": 518}'
+    ]
   end
 end
 
