marlitas · marlitas · Oct 7, 2021 · Oct 7, 2021 · Oct 7, 2021 · Oct 7, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,36 @@
+# 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/[email protected]
+  heroku: circleci/[email protected]
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    docker:
+      - image: cimg/ruby:2.7.2
+    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:
+  heroku_deploy:
+      jobs:
+        - build
+        - heroku/deploy-via-git: # Use the pre-configured job, deploy-via-git
+            requires:
+              - build
+            filters:
+              branches:
+                only: main
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 !/log/.keep
 !/tmp/.keep
 /coverage
+./coverage
 
 # Ignore uploaded files in development
 /storage/*
@@ -22,3 +23,8 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+
+/coverage
+
+# Ignore application configuration
+/config/application.yml
diff --git 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
@@ -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)
@@ -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)
@@ -77,15 +79,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 +149,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,21 +181,23 @@ 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)
     will_paginate (3.1.8)
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   bootsnap (>= 1.1.0)
   byebug
   factory_bot_rails
   faker
   fast_jsonapi
+  figaro
   listen (>= 3.0.5, < 3.2)
   pg (>= 0.18, < 2.0)
   pry

diff --git 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
@@ -14,7 +14,7 @@
       <img src="./assets/0.12.3/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" class="hide">
-      <div class="timestamp">Generated <abbr class="timeago" title="2021-09-10T09:04:22-07:00">2021-09-10T09:04:22-07:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2021-09-10T09:22:49-07:00">2021-09-10T09:22:49-07:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -43,8 +43,8 @@ <h2>
   </div>
 
   <div class="t-line-summary">
-    <b>721</b> relevant lines,
-    <span class="green"><b>719</b> lines covered</span> and
+    <b>722</b> relevant lines,
+    <span class="green"><b>720</b> lines covered</span> and
     <span class="red"><b>2</b> lines missed. </span>
     (<span class="green">
   99.72%
@@ -514,10 +514,10 @@ <h2>
             <td class="strong t-file__name"><a href="#5627e2d3dcedb7c161186e0207001ad5c9864664" class="src_link" title="spec/requests/api/v1/merchants_request_spec.rb">spec/requests/api/v1/merchants_request_spec.rb</a></td>
             <td class="green strong cell--number t-file__coverage">100.00 %</td>
             <td class="cell--number">230</td>
-            <td class="cell--number">141</td>
-            <td class="cell--number">141</td>
+            <td class="cell--number">142</td>
+            <td class="cell--number">142</td>
             <td class="cell--number">0</td>
-            <td class="cell--number">2.95</td>
+            <td class="cell--number">2.94</td>
 
           </tr>
 
@@ -12902,8 +12902,8 @@ <h4>
 
 
     <div class="t-line-summary">
-      <b>141</b> relevant lines.
-      <span class="green"><b>141</b> lines covered</span> and
+      <b>142</b> relevant lines.
+      <span class="green"><b>142</b> lines covered</span> and
       <span class="red"><b>0</b> lines missed.</span>
     </div>
 
@@ -14026,13 +14026,13 @@ <h4>
         </div>
 
         <div>
-          <li class="never" data-hits="" data-linenumber="102">
-
+          <li class="covered" data-hits="1" data-linenumber="102">
+            <span class="hits">1</span>
 
 
 
 
-            <code class="ruby">       # expect(merchant[:data][:message]).to eq(&#39;No match found.&#39;)</code>
+            <code class="ruby">       expect(merchant[:data][:message]).to eq(&#39;No match found&#39;)</code>
           </li>
         </div>