From a80da2b13cbdc5e4bfe2cce37d59fba444713c4c Mon Sep 17 00:00:00 2001 From: bharat619 Date: Fri, 24 Apr 2020 16:21:05 +0530 Subject: [PATCH 1/6] initial commit --- .circleci/config.yml | 4 ++-- Gemfile | 4 ++-- Gemfile.lock | 11 +---------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c6609b6f..1cc182eee 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2 defaults: &defaults docker: - - image: circleci/ruby:2.5.1-node + - image: circleci/ruby:2.6.0-node working_directory: ~/api.goodcity jobs: @@ -47,7 +47,7 @@ jobs: test: <<: *defaults docker: - - image: circleci/ruby:2.5.1-node + - image: circleci/ruby:2.6.0-node - image: circleci/postgres:9.6.9-alpine-ram - image: circleci/redis:4.0.9-alpine parallelism: 4 diff --git a/Gemfile b/Gemfile index 2e69ebef6..56b330e30 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "2.5.1" +ruby "2.6.0" gem 'rails', '~> 4.2.11.1' gem 'rails-api' @@ -41,7 +41,7 @@ gem 'redis' gem 'redis-rails' gem 'rollbar' gem 'apipie-rails' , git: "https://github.com/Apipie/apipie-rails.git", branch: 'master' -gem "go_go_van_api", git: "git@github.com:crossroads/go_go_van_api.git", branch: 'master' +# gem "go_go_van_api", git: "git@github.com:crossroads/go_go_van_api.git", branch: 'master' gem 'by_star', git: "https://github.com/radar/by_star.git" gem 'nestful', git: "https://github.com/maccman/nestful.git" gem "nokogiri", ">= 1.10.8" diff --git a/Gemfile.lock b/Gemfile.lock index 0e56f7cb6..bd7de4104 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: git@github.com:crossroads/go_go_van_api.git - revision: 3cbc5590e2a11a7903483de276bc668be88843cb - branch: master - specs: - go_go_van_api (0.0.1) - nestful (~> 1) - GIT remote: https://github.com/Apipie/apipie-rails.git revision: 529eb91b2a4ef30ff5ce251684f5030e1a20929e @@ -490,7 +482,6 @@ DEPENDENCIES fake_email_validator ffaker foreman - go_go_van_api! guard-rspec http_accept_language jwt (~> 1.5.0) @@ -545,7 +536,7 @@ DEPENDENCIES with_advisory_lock RUBY VERSION - ruby 2.5.1p57 + ruby 2.6.0p0 BUNDLED WITH 1.17.3 From f4a7495f12b19989b5233973de4e0c7d58cc3a42 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Fri, 24 Apr 2020 16:23:42 +0530 Subject: [PATCH 2/6] adding gogovan api --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 56b330e30..cbcc58c28 100755 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'redis' gem 'redis-rails' gem 'rollbar' gem 'apipie-rails' , git: "https://github.com/Apipie/apipie-rails.git", branch: 'master' -# gem "go_go_van_api", git: "git@github.com:crossroads/go_go_van_api.git", branch: 'master' +gem "go_go_van_api", git: "git@github.com:crossroads/go_go_van_api.git", branch: 'master' gem 'by_star', git: "https://github.com/radar/by_star.git" gem 'nestful', git: "https://github.com/maccman/nestful.git" gem "nokogiri", ">= 1.10.8" From 5aa2d999de96b5dd5ddc8da4f1ea0d199bcb18d0 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Fri, 24 Apr 2020 16:31:42 +0530 Subject: [PATCH 3/6] update gemlock with go_go_van_api --- Gemfile.lock | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index bd7de4104..0d78e2f7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ + GIT + remote: git@github.com:crossroads/go_go_van_api.git + revision: 3cbc5590e2a11a7903483de276bc668be88843cb + branch: master + specs: + go_go_van_api (0.0.1) + nestful (~> 1) + GIT remote: https://github.com/Apipie/apipie-rails.git revision: 529eb91b2a4ef30ff5ce251684f5030e1a20929e @@ -482,6 +490,7 @@ DEPENDENCIES fake_email_validator ffaker foreman + go_go_van_api! guard-rspec http_accept_language jwt (~> 1.5.0) From e5f5608f8826307ab02f59c0e281cc5e3750fcdf Mon Sep 17 00:00:00 2001 From: bharat619 Date: Fri, 24 Apr 2020 16:40:45 +0530 Subject: [PATCH 4/6] remove go_go_van_api from gemfile.lock --- Gemfile.lock | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0d78e2f7c..bd7de4104 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ - GIT - remote: git@github.com:crossroads/go_go_van_api.git - revision: 3cbc5590e2a11a7903483de276bc668be88843cb - branch: master - specs: - go_go_van_api (0.0.1) - nestful (~> 1) - GIT remote: https://github.com/Apipie/apipie-rails.git revision: 529eb91b2a4ef30ff5ce251684f5030e1a20929e @@ -490,7 +482,6 @@ DEPENDENCIES fake_email_validator ffaker foreman - go_go_van_api! guard-rspec http_accept_language jwt (~> 1.5.0) From 9f7ea56c1f63ad95cc8965e1105e30900ad59daa Mon Sep 17 00:00:00 2001 From: bharat619 Date: Thu, 23 Jul 2020 16:45:29 +0530 Subject: [PATCH 5/6] updating gemfile for go_go_van_api --- Gemfile.lock | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index bd7de4104..89ac186c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git@github.com:crossroads/go_go_van_api.git + revision: 3cbc5590e2a11a7903483de276bc668be88843cb + branch: master + specs: + go_go_van_api (0.0.1) + nestful (~> 1) + GIT remote: https://github.com/Apipie/apipie-rails.git revision: 529eb91b2a4ef30ff5ce251684f5030e1a20929e @@ -482,6 +490,7 @@ DEPENDENCIES fake_email_validator ffaker foreman + go_go_van_api! guard-rspec http_accept_language jwt (~> 1.5.0) From fe5fea3bbd4dd0fafa9c425a6ed409e9ba616e42 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Thu, 6 Aug 2020 09:42:35 +0530 Subject: [PATCH 6/6] Monkey patch MonitorMixin --- spec/support/controller_helpers.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/spec/support/controller_helpers.rb b/spec/support/controller_helpers.rb index aac2d6216..f224032b2 100644 --- a/spec/support/controller_helpers.rb +++ b/spec/support/controller_helpers.rb @@ -1,6 +1,23 @@ # test/test_helpers/warden.rb -# Based on http://stackoverflow.com/questions/13420923/configuring-warden-for-use-in-rspec-controller-specs +if RUBY_VERSION >= '2.6.0' + if Rails.version < '5' + module ActionController + class TestResponse < ActionDispatch::TestResponse + def recycle! + # HACK: to avoid MonitorMixin double-initialize error: + @mon_mutex_owner_object_id = nil + @mon_mutex = nil + initialize + end + end + end + else + puts 'Monkeypatch for ActionController::TestResponse no longer needed' + end +end + +# Based on http://stackoverflow.com/questions/13420923/configuring-warden-for-use-in-rspec-controller-specs module Warden # Warden::Test::ControllerHelpers provides a facility to test controllers in isolation # Most of the code was extracted from Devise's Devise::TestHelpers.