From db560f7b9427ea3df24f9d04722b7bc256629bea Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:15:37 -0700 Subject: [PATCH 1/7] Update gemfile lock --- .gitignore | 3 +++ Gemfile.lock | 19 +++++++++++-------- coverage/.resultset.json | 4 ++-- coverage/index.html | 22 +++++++++++----------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 24b5d03..04a0688 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ !/log/.keep !/tmp/.keep /coverage +./coverage # Ignore uploaded files in development /storage/* @@ -22,3 +23,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +/coverage diff --git a/Gemfile.lock b/Gemfile.lock index 7efd2da..aea5966 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,7 +44,7 @@ GEM tzinfo (~> 1.1) arel (9.0.0) ast (2.4.2) - bootsnap (1.8.1) + bootsnap (1.9.1) msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) @@ -77,15 +77,17 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.1) minitest (5.14.4) msgpack (1.4.2) nio4r (2.5.8) - nokogiri (1.12.4-x86_64-darwin) + nokogiri (1.12.5-x86_64-darwin) racc (~> 1.4) - parallel (1.20.1) + nokogiri (1.12.5-x86_64-linux) + racc (~> 1.4) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) @@ -145,16 +147,16 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.2) - rubocop (1.20.0) + rubocop (1.22.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.12.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby_dep (1.5.0) @@ -177,7 +179,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -185,6 +187,7 @@ GEM PLATFORMS x86_64-darwin-20 + x86_64-linux DEPENDENCIES bootsnap (>= 1.1.0) diff --git a/coverage/.resultset.json b/coverage/.resultset.json index 1fda2a4..5107627 100644 --- a/coverage/.resultset.json +++ b/coverage/.resultset.json @@ -1078,7 +1078,7 @@ null, 1, null, - null, + 1, null, null, null, @@ -1501,6 +1501,6 @@ ] } }, - "timestamp": 1631289862 + "timestamp": 1631290969 } } diff --git a/coverage/index.html b/coverage/index.html index 74bd635..d1bec6c 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -14,7 +14,7 @@ loading
-
Generated 2021-09-10T09:04:22-07:00
+
Generated 2021-09-10T09:22:49-07:00
@@ -43,8 +43,8 @@

- 721 relevant lines, - 719 lines covered and + 722 relevant lines, + 720 lines covered and 2 lines missed. ( 99.72% @@ -514,10 +514,10 @@

spec/requests/api/v1/merchants_request_spec.rb 100.00 % 230 - 141 - 141 + 142 + 142 0 - 2.95 + 2.94 @@ -12902,8 +12902,8 @@

- 141 relevant lines. - 141 lines covered and + 142 relevant lines. + 142 lines covered and 0 lines missed.
@@ -14026,13 +14026,13 @@

-
  • - +
  • + 1 - # expect(merchant[:data][:message]).to eq('No match found.') + expect(merchant[:data][:message]).to eq('No match found')
    • From da0751768798c646a5e57cf1be988ee716475a66 Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:28:35 -0700 Subject: [PATCH 2/7] Add circle ci yml file --- .circleci/config.yml | 30 ++++++++++++++++++++++++++++++ .gitignore | 3 +++ Gemfile | 1 + Gemfile.lock | 3 +++ 4 files changed, 37 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..ccb0aa5 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,30 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 + +# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects. +# See: https://circleci.com/docs/2.0/orb-intro/ +orbs: + ruby: circleci/ruby@0.1.2 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/2.0/configuration-reference/#jobs +jobs: + build: + docker: + - image: circleci/ruby:2.6.3-stretch-node + executor: ruby/default + steps: + - checkout + - run: + name: Which bundler? + command: bundle -v + - ruby/bundle-install + +# Invoke jobs via workflows +# See: https://circleci.com/docs/2.0/configuration-reference/#workflows +workflows: + sample: # This is the name of the workflow, feel free to change it to better match your workflow. + # Inside the workflow, you define the jobs you want to run. + jobs: + - build diff --git a/.gitignore b/.gitignore index 04a0688..27c1fb3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ /config/master.key /coverage + +# Ignore application configuration +/config/application.yml diff --git a/Gemfile b/Gemfile index 9a82e07..2d4c89d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gem 'puma', '~> 3.11' gem 'will_paginate', '~> 3.1.0' gem 'fast_jsonapi' +gem 'figaro' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production diff --git a/Gemfile.lock b/Gemfile.lock index aea5966..2de9b23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,8 @@ GEM fast_jsonapi (1.5) activesupport (>= 4.2) ffi (1.15.4) + figaro (1.2.0) + thor (>= 0.14.0, < 2) globalid (0.5.2) activesupport (>= 5.0) i18n (1.8.10) @@ -195,6 +197,7 @@ DEPENDENCIES factory_bot_rails faker fast_jsonapi + figaro listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) pry From 2c267dab8f0ea02da820523b8a1267b1ccc226db Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:41:40 -0700 Subject: [PATCH 3/7] Change docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ccb0aa5..f553ec5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ orbs: jobs: build: docker: - - image: circleci/ruby:2.6.3-stretch-node + - image: cimg/ruby:3.0.2 executor: ruby/default steps: - checkout From 833248d70e63835d30e7202541358e994416b878 Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:42:46 -0700 Subject: [PATCH 4/7] Change ruby version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f553ec5..5a854a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ orbs: jobs: build: docker: - - image: cimg/ruby:3.0.2 + - image: cimg/ruby:2.7.2 executor: ruby/default steps: - checkout From 3c071f4c7af660494a0a5ae3be3a324a0b84e670 Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:48:52 -0700 Subject: [PATCH 5/7] Add heroky configuration --- .circleci/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a854a5..2b16d0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,7 @@ version: 2.1 # See: https://circleci.com/docs/2.0/orb-intro/ orbs: ruby: circleci/ruby@0.1.2 + heroku: circleci/heroku@0.0.10. # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs @@ -28,3 +29,12 @@ workflows: # Inside the workflow, you define the jobs you want to run. jobs: - build + heroku_deploy: + jobs: + - build + - heroku/deploy-via-git: # Use the pre-configured job, deploy-via-git + requires: + - build + filters: + branches: + only: main From c7448d54d881936491048919add096ed3f3ee9bd Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:49:59 -0700 Subject: [PATCH 6/7] Change heroku orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b16d0c..1e4ce2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 # See: https://circleci.com/docs/2.0/orb-intro/ orbs: ruby: circleci/ruby@0.1.2 - heroku: circleci/heroku@0.0.10. + heroku: circleci/heroku@1.2.6 # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs From cf24b0d9f2495dd99a4765986ec3eab2d74d2a1a Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 7 Oct 2021 15:57:48 -0700 Subject: [PATCH 7/7] Remove unnecessary job --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e4ce2c..8f81709 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,10 +25,6 @@ jobs: # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: - sample: # This is the name of the workflow, feel free to change it to better match your workflow. - # Inside the workflow, you define the jobs you want to run. - jobs: - - build heroku_deploy: jobs: - build