Set position=max+1 for new text block and add asserts to existing integration tests

Author: sanak

app/models/text_block.rb

@@ -5,6 +5,9 @@ class TextBlock < ActiveRecord::Base
 
   validates :name, presence: true
   validate :name_uniqueness
+  validates_numericality_of :position, :only_integer => true
+  before_create :set_position
+
   scope :sorted, ->{ order :position }
 
   private
@@ -21,4 +24,15 @@ def name_uniqueness
     end
   end
 
+  def set_position
+    if project_id.present?
+      max = self.class.where(:project_id => project_id).maximum(:position) || 0
+      self.position = max + 1
+    else
+      binding.pry
+      max = self.class.where(:project_id => nil).maximum(:position) || 0
+      self.position = max + 1
+    end
+  end
+
 end

test/integration/text_blocks_admin_test.rb

@@ -31,6 +31,7 @@ def test_textblock_crud
 
     assert b = TextBlock.find_by_name('test')
     assert_equal 'lorem ipsum', b.text
+    assert_equal 1, b.position
 
     get "/text_blocks/#{b.id}/edit"
     assert_response :success
@@ -40,6 +41,17 @@ def test_textblock_crud
     assert_equal 'lorem ipsum', b.text
     assert_equal 'new', b.name
 
+    assert_difference 'TextBlock.count' do
+      post '/text_blocks', params: { text_block: { name: 'test2', text: 'lorem ipsum2'}}
+    end
+    assert_redirected_to '/text_blocks'
+
+    follow_redirect!
+
+    assert b = TextBlock.find_by_name('test2')
+    assert_equal 'lorem ipsum2', b.text
+    assert_equal 2, b.position
+
     assert_difference 'TextBlock.count', -1 do
       delete "/text_blocks/#{b.id}"
     end

test/integration/text_blocks_project_test.rb

@@ -45,6 +45,7 @@ def test_textblock_crud
 
     assert b = TextBlock.find_by_name('test')
     assert_equal 'lorem ipsum', b.text
+    assert_equal 1, b.position
 
     get "/projects/ecookbook/text_blocks/#{b.id}/edit"
     assert_response :success
@@ -54,6 +55,17 @@ def test_textblock_crud
     assert_equal 'lorem ipsum', b.text
     assert_equal 'new', b.name
 
+    assert_difference 'TextBlock.count' do
+      post '/projects/ecookbook/text_blocks', params: { text_block: { name: 'test2', text: 'lorem ipsum2'}}
+    end
+    assert_redirected_to '/projects/ecookbook/settings/text_blocks'
+
+    follow_redirect!
+
+    assert b = TextBlock.find_by_name('test2')
+    assert_equal 'lorem ipsum2', b.text
+    assert_equal 2, b.position
+
     assert_difference 'TextBlock.count', -1 do
       delete "/projects/ecookbook/text_blocks/#{b.id}"
     end