Fixes Issue #266 (#288)

etagwerker · DamonClark · web-flow · commit 4223bb407474 · 2023-03-04T20:26:15.000-05:00
* add value create

* update spec test

* Bump version of Ruby

* Generated schema

* Use i18n for button label

* Expect to see "Save changes" as a button, not "Create"

* Bump CI to Ruby 3.1.1

---------

Co-authored-by: Damon Clark &lt;dclark312@gmail.com&gt;
diff --git a/.github/workflows/tests-next.yml b/.github/workflows/tests-next.yml
@@ -35,11 +35,11 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1.0"
+          ruby-version: "3.1.1"
 
       - name: Build App
         run: |
-          bundle update rails --jobs=4 --retry=3   
+          bundle update rails --jobs=4 --retry=3
           bundle exec rails db:setup
       - name: Run RSpec
         run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1.0"
+          ruby-version: "3.1.1"
           bundler-cache: true
 
       - name: Build App
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ def next?
   File.basename(__FILE__) == "Gemfile.next"
 end
 
-ruby "3.1.0"
+ruby "3.1.1"
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -430,7 +430,7 @@ DEPENDENCIES
   webdrivers
 
 RUBY VERSION
-   ruby 3.1.0p0
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.2.26
+   2.4.7
diff --git a/app/views/estimates/_form.html.erb b/app/views/estimates/_form.html.erb
@@ -26,7 +26,7 @@
   </div>
 
   <div class="btn-group">
-    <%= f.submit yield(:button_text), class: "button", id: "edit" %>
+    <%= f.submit t(".button_text"), value: t(".button_text"), class: "button", id: "edit" %>
   </div>
 
   <% if estimate.persisted? %>
diff --git a/app/views/estimates/edit.html.erb b/app/views/estimates/edit.html.erb
@@ -1,6 +1,4 @@
 <div class="container">
-  <% provide(:button_text, 'Save Changes') %>
-
   <%= render "shared/story", story: @story %>
 
   <hr>
diff --git a/app/views/estimates/edit.js.erb b/app/views/estimates/edit.js.erb
@@ -1,4 +1,3 @@
-<% provide(:button_text, 'Save Changes') %>
 (function(){
   showModal("Edit Estimate", "<%= j(render partial: "modal_body") %>")
 })()
diff --git a/app/views/estimates/new.html.erb b/app/views/estimates/new.html.erb
@@ -1,6 +1,4 @@
 <div class="container">
-  <% provide(:button_text, 'Create') %>
-
   <p>New Estimate</p>
   <%= render "shared/story", story: @story %>
 
diff --git a/app/views/estimates/new.js.erb b/app/views/estimates/new.js.erb
@@ -1,4 +1,3 @@
-<% provide(:button_text, 'Create') %>
 (function(){
   showModal("New Estimate", "<%= j(render partial: "modal_body") %>")
 })()
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -30,4 +30,8 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
+  estimates:
+    form:
+      button_text: "Save changes"
   hello: "Hello world"
+
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_06_21_141342) do
-
+ActiveRecord::Schema[7.0].define(version: 2022_06_21_141342) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -20,26 +19,26 @@
     t.integer "worst_case_points"
     t.integer "user_id"
     t.integer "story_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "projects", force: :cascade do |t|
     t.string "title"
     t.string "status"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "parent_id"
     t.integer "position"
-    t.datetime "locked_at"
+    t.datetime "locked_at", precision: nil
   end
 
   create_table "stories", force: :cascade do |t|
     t.string "title"
     t.text "description"
     t.integer "project_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "position"
     t.integer "real_score"
     t.string "extra_info"
@@ -49,15 +48,15 @@
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.inet "current_sign_in_ip"
     t.inet "last_sign_in_ip"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "admin", default: false
     t.string "name"
     t.string "provider"
diff --git a/spec/features/estimates_manage_spec.rb b/spec/features/estimates_manage_spec.rb
@@ -22,7 +22,7 @@
 
     it "allows me to add an estimate" do
       set_estimates(3, 8)
-      click_button "Create"
+      click_button "Save changes"
       expect(Estimate.count).to eq 1
 
       expect(page).to have_content "3"
@@ -31,7 +31,7 @@
 
     it "allows me to add an estimate", js: false do
       set_estimates(3, 8)
-      click_button "Create"
+      click_button "Save changes"
       expect(Estimate.count).to eq 1
       expect(page).to have_content "Estimate created!"
     end
@@ -52,15 +52,15 @@
 
     it "allows me to edit an estimate" do
       set_estimates(1, 2)
-      click_button "Save Changes"
+      click_button "Save changes"
 
       expect(page).to have_content "1"
       expect(page).to have_content "2"
     end
 
     it "allows me to edit an estimate", js: false do
       set_estimates(1, 2)
-      click_button "Save Changes"
+      click_button "Save changes"
       expect(page).to have_content "Estimate updated!"
     end
   end
@@ -75,7 +75,7 @@
 
     it "shows me an error message" do
       set_estimates(21, 1)
-      click_button "Save Changes"
+      click_button "Save changes"
       expect(page).to have_content "Validation error Worst case estimate should be greater than best case estimate."
     end
   end
@@ -103,7 +103,7 @@
         expect(current_path).to eq project_path(id: project.id)
 
         set_estimates(3, 8)
-        click_button "Create"
+        click_button "Save changes"
       end
       expect_closed_modal
 
@@ -118,7 +118,7 @@
         expect(page).to have_content(story.description)
 
         set_estimates(5, 8)
-        click_button "Save Changes"
+        click_button "Save changes"
       end
       expect_closed_modal
 
@@ -128,7 +128,7 @@
 
       within_modal do
         set_estimates(5, 13)
-        click_button "Save Changes"
+        click_button "Save changes"
       end
       expect_closed_modal
 
@@ -149,7 +149,7 @@
         # make sure the delete button is not there during creation
         expect(page).to have_selector("a", text: "Delete Estimate", count: 0)
 
-        click_button "Create"
+        click_button "Save changes"
       end
       expect_closed_modal
 
