Merge branch 'hotfix/v1.6.4'

odinsride · May 17, 2020 · c9aee4c · c9aee4c
2 parents 8553b4c + a73cbba
commit c9aee4c
Show file tree

Hide file tree

Showing 6 changed files with 454 additions and 441 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] changes
 
+## [v1.6.4] - 2020-05-17
+
+### Fixed
+- Account Starting Balance field now allows decimals. Fixes #82
+
+### Changed
+- Gems and Yarn dependencies updated
+
 ## [v1.6.3] - 2020-04-17
 
 ### Fixed
@@ -181,8 +189,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Account overview with list of all accounts and balances for each
 
 
-[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.6.3...HEAD
-[v1.6.3]: https://github.com/odinsride/olubalance/compare/v1.6.3...v1.6.3
+[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.6.4...HEAD
+[v1.6.3]: https://github.com/odinsride/olubalance/compare/v1.6.3...v1.6.4
+[v1.6.3]: https://github.com/odinsride/olubalance/compare/v1.6.2...v1.6.3
 [v1.6.2]: https://github.com/odinsride/olubalance/compare/v1.6.1...v1.6.2
 [v1.6.1]: https://github.com/odinsride/olubalance/compare/v1.6.0...v1.6.1
 [v1.6.0]: https://github.com/odinsride/olubalance/compare/v1.5.0...v1.6.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,13 +64,13 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.308.0)
-    aws-sdk-core (3.94.0)
+    aws-partitions (1.316.0)
+    aws-sdk-core (3.96.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.30.0)
+    aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.60.2)
@@ -80,15 +80,15 @@ GEM
     aws-sigv4 (1.1.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
     bcrypt (3.1.13)
-    better_errors (2.7.0)
+    better_errors (2.7.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.32.1)
+    capybara (3.32.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -133,9 +133,8 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.7.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     jmespath (1.4.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -153,11 +152,11 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.4)
+    mimemagic (0.3.5)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     nio4r (2.5.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
@@ -175,7 +174,7 @@ GEM
       pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     puma (4.3.3)
       nio4r (~> 2.0)
     rack (2.2.2)
@@ -229,7 +228,7 @@ GEM
     rexml (3.2.4)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -244,8 +243,7 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)

diff --git a/app/views/accounts/components/_form.html.erb b/app/views/accounts/components/_form.html.erb
@@ -50,8 +50,7 @@
       <div class="field">
         <label class="label has-text-grey">Starting Balance</label>
         <div class="control has-icons-left">
-          <%= f.number_field :starting_balance, type: "number",
-                                              class: "input is-primary",
+          <%= f.text_field :starting_balance, class: "input is-primary",
                                               placeholder: "Enter the starting balance",
                                               disabled: (@account.new_record? ? false : true) %>
           <span class="icon is-small is-left has-text-primary">

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
@@ -6,6 +6,7 @@
   describe 'validations' do
     it { should validate_presence_of(:name) }
     it { should validate_presence_of(:starting_balance) }
+    it { should allow_value(150.51).for(:starting_balance) }
     it { should validate_uniqueness_of(:name).scoped_to(:user_id) }
     it { should allow_value('My Account').for(:name) }
     it { should_not allow_value('A').for(:name) }

diff --git a/spec/request/account_management_spec.rb b/spec/request/account_management_spec.rb
@@ -35,12 +35,12 @@
     get new_account_path
     expect(response.body).to include("New Account")
 
-    post "/accounts", params: { account: { name: "Test Create Account", starting_balance: 3500, user: @user.id } }
+    post "/accounts", params: { account: { name: "Test Create Account", starting_balance: 3500.50, user: @user.id } }
     expect(response).to redirect_to(accounts_path)
     follow_redirect!
 
     expect(response.body).to include("Test Create Account")
-    expect(response.body).to include("$3,500.00")
+    expect(response.body).to include("$3,500.50")
   end
 
   it "updates an existing account and redirects to the accounts page" do