Add test, remove logic dependency on 'uncategorized'

.rspec

@@ -0,0 +1 @@
+--require spec_helper

Gemfile

@@ -40,6 +40,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'rspec-rails', '~> 3.8'
 end
 
 group :development do

Gemfile.lock

@@ -96,6 +96,7 @@ GEM
     devise_invitable (1.7.4)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
+    diff-lcs (1.3)
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.25)
@@ -188,6 +189,23 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     sass (3.6.0)
@@ -270,6 +288,7 @@ DEPENDENCIES
   puma (~> 3.11)
   rails (~> 5.2.1)
   react-rails
+  rspec-rails (~> 3.8)
   sass-rails (~> 5.0)
   selenium-webdriver
   serviceworker-rails
@@ -287,4 +306,4 @@ RUBY VERSION
    ruby 2.4.4p296
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

app/assets/javascripts/transactions.js

@@ -41,7 +41,7 @@ function ready() {
     console.debug("[transactions] Category changed");
     var tid = $(e.target).data('transaction');
     var cat = e.target.value;
-    var color = $(e.target).find(`[value=${cat}]`).data('color');
+    var color = cat ? $(e.target).find(`[value=${cat}]`).data('color') : '#ffffff';
     console.debug('color', color);
     $(e.target).parent().parent().find('td .hidden.loading').show(200).delay(10).addClass('spin-animation');
     $.ajax(`/transactions/category/${tid}/${cat}`, {

app/controllers/categories_controller.rb

@@ -3,7 +3,7 @@ class CategoriesController < ApplicationController
   before_action :load_category, only: %i[update edit destroy]
 
   def index
-    @categories = Category.where(user_id: current_user.id)
+    @categories = current_user.categories
   end
 
   def new

app/controllers/transactions_controller.rb

@@ -70,7 +70,7 @@ def groupby
   end
 
   def set_category
-   current_user.transactions.find(params[:id]).update_attributes(category: Category.find(params[:category]))
+    current_user.transactions.find(params[:id]).update_attributes(category: Category.find_by(id: params[:category]))
   end
 
 	private

app/helpers/transactions_helper.rb

@@ -16,16 +16,10 @@ def groups
   end
 
   def categories(transaction)
-    u = Category.find(1)
-    selected_attr = transaction.category&.id == u.id ? 'selected' : ''
-    uncat = "<option value='#{u.name}' class='category-#{u.name}' #{selected_attr} data-color='#{u.color}'>#{u.display_name}</option>\n"
-
-    cats = Category.where(user_id: [nil, current_user.id]).offset(1)
-    cats = cats.order(:display_name).map do |c|
+    cats = current_user.categories.order(:display_name).map do |c|
       selected_attr = transaction.category&.id == c.id ? 'selected' : ''
       "<option value='#{c.id}' class='category-#{c.name}' #{selected_attr} data-color='#{c.color}'>#{c.display_name}</option>\n"
     end.join
-
-    uncat + cats
+    cats
   end
 end

app/models/user.rb

@@ -6,4 +6,8 @@ class User < ApplicationRecord
 	has_many :statements
 	has_many :transactions, through: :statements
   has_many :goals
+
+  def categories
+    Category.where(user_id: [nil, id]).where.not(name: 'uncategorized')
+  end
 end

app/views/transactions/_transactions.html.erb

@@ -54,10 +54,11 @@
                                   class: 'category-select custom-select',
                                   'data-transaction' => t.id.to_s,
                                   style: "background-color: #{t.category&.color || 'white'}",
+                                  include_blank: 'Selecione',
                                   id: nil)
                                 %>
           </td>
-          <% [%w[credit  Entrada], 
+          <% [%w[credit  Entrada],
               %w[debit   Saída],
               %w[balance Saldo]
           ].each do |attr, header| %>

config/routes.rb

@@ -12,6 +12,7 @@
 			get '/',                             action: :index
       get '/statement/:id',                action: :statement
       patch '/category/:id/:category',     action: :set_category
+      patch '/category/:id/',              action: :set_category
       get 'by/category/:id/amount',        action: :category_amount
 
       scope '/:year/:month' do

spec/models/category_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe Category, type: :model do
+  describe "should exclude sentinel category only" do
+    let(:u) { User.create(email: 'foo@bar') }
+
+    before do
+      Category.create(name: 'uncategorized')
+      Category.create(name: 'another_category')
+      Category.create(name: 'some_user_category', user_id: u.id)
+    end
+
+    it 'should exclude uncategoized' do
+      expect(u.categories.count).to be(2)
+      expect(u.categories.pluck(:name)).not_to include('uncategorized')
+    end
+  end
+end

spec/rails_helper.rb

@@ -0,0 +1,61 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove these lines.
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  puts e.to_s.strip
+  exit 1
+end
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end

spec/spec_helper.rb

@@ -0,0 +1,96 @@
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

test/models/category_test.rb

@@ -4,4 +4,13 @@ class CategoryTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
+  #
+  test 'uncategorized' do
+    user = User.create(email: 'foo@bar', password: 'foo', confirmed_at: DateTime.now)
+    Category.create(name: 'uncategorized', display_name: 'No category')
+    Category.create(name: 'some_global_cat', display_name: 'Global Cat')
+    Category.create(name: 'user_cat', display_name: 'User Cat')
+
+    assert user.categories.where.not(name: 'uncategorized').count == 2
+  end
 end