foreman_datacenter 0.1.48 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939df6100118cf4668cde16490a2cb6d4030dc35
-  data.tar.gz: fa4a4448db4cc2ad2b2bcf25738e0574cfb7886f
+  metadata.gz: 9b07e0a47d71b4b05a50a937eea06dabbd2b0131
+  data.tar.gz: 1c365a909465a75aab9cf4e4c605448ac66d0245
 SHA512:
-  metadata.gz: dc69e06292eefa62573c53d64c7435d5a386095f62ca76a4650ee2a16848ce0dacdfd125084e84b39ff8a453f9619880a04fccc8c6afcc64a0870daab03442df
-  data.tar.gz: ea73aa9a68d1b95efa9ce6f1009af056479418e28bd4a19ed68f32e92ed1d598d529aaa75ccfa8668e92a0a3dda277458394bee33af6c02fce539fd85b63ede8
+  metadata.gz: 624f0c12cd663ad9b3d89c133d42ac4a76573266794f7e312994a5140089a2eba784541e8d9812eb4195cc87ac404deef6429c2caa6a719f88f1f9e0e41904be
+  data.tar.gz: 17e8c4a7c91f1668848337db91d1ac0b50e8d6874429ce2170549c15e9a175469e86af1ae2390c40b41713d1e71bd323deda188129f1ab738118080d18848575

data/app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb

@@ -14,7 +14,7 @@ module ForemanDatacenter
         search = resource_base.search_for ''
       end
       @hosts = search.includes(:device, :operatingsystem, :environment, :model, :compute_resource).
-        paginate(:page => params[:page])
+        paginate(:page => params[:page], :per_page => params[:per_page])
     end
 
     private

data/app/controllers/foreman_datacenter/device_types_controller.rb

@@ -4,7 +4,7 @@ module ForemanDatacenter
 
     def index
       @device_types = DeviceType.includes(:manufacturer).
-        paginate(:page => params[:page])
+        paginate(:page => params[:page], :per_page => params[:per_page])
     end
 
     def show

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -20,7 +20,7 @@ module ForemanDatacenter
         search = resource_base.search_for ''
       end
       @devices = search.includes(:device_role, :device_type, :site, :rack).
-        paginate(:page => params[:page])
+        paginate(:page => params[:page], :per_page => params[:per_page])
     end
 
     def show

data/app/views/foreman_datacenter/devices/show.html.erb

@@ -337,7 +337,7 @@
               <% end %>
               <div class="panel-footer text-right">
 		<%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
-                            class: 'btn btn-primary btn-xs' %>
+                            class: 'btn btn-primary btn-xs' if @device.host %>
                 <%= link_to 'Add an interface', new_device_device_interface_path(@device),
                             class: 'btn btn-primary btn-xs' %>
                 <%= button_tag 'Destroy selected interfaces',

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.48'.freeze
+  VERSION = '0.1.49'.freeze
 end

data/test/controllers/foreman_datacenter/rack_groups_contoller_test.rb

@@ -1,91 +1,91 @@
-require 'test_helper'
-
-module ForemanDatacenter
-  class RackGroupsControllerTest < ActionController::TestCase
-    setup do
-      @model = RackGroup.first
-    end
-
-    basic_index_test
-    basic_new_test
-    basic_edit_test
-    basic_pagination_per_page_test
-    basic_pagination_rendered_test
-
-    test 'test_new_submit_button_id' do
-      get :new, {}, set_session_user
-      assert_select "[data-id='aid_create_foreman_datacenter_rack_group']"
-    end
-
-    test 'test_new_cancel_button_id' do
-      get :new, {}, set_session_user
-      assert_select "[data-id='aid_datacenter_rack_groups']"
-    end
-
-    test 'test_create_invalid' do
-      RackGroup.any_instance.stubs(:valid?).returns(false)
-      post :create, {:rack_group => {:name => nil, :site_id => nil}}, set_session_user
-      assert_template 'new'
-    end
-
-    test 'test_create_valid' do
-      RackGroup.any_instance.stubs(:valid?).returns(true)
-      post :create, {:rack_group => {:name => 'test rack_group', :site_id => Site.first.id}}, set_session_user
-      assert_redirected_to rack_groups_url
-    end
-
-    test 'test_edit_submit_button_id' do
-      get :edit, {:id => RackGroup.first}, set_session_user
-      assert_select "[data-id='aid_update_foreman_datacenter_rack_group']"
-    end
-
-    test 'test_update_invalid' do
-      RackGroup.any_instance.stubs(:valid?).returns(false)
-      put :update, {:id => RackGroup.first.to_param, :rack_group => {:name => "3243"}}, set_session_user
-      assert_template 'edit'
-    end
-
-    test 'test_update_valid' do
-      Site.any_instance.stubs(:valid?).returns(true)
-      put :update, {:id => RackGroup.first.to_param, :rack_group => {:name => RackGroup.first.name}}, set_session_user
-      assert_redirected_to rack_groups_url
-    end
-
-    test 'test_destroy' do
-      rack_group = RackGroup.first
-      delete :destroy, {:id => rack_group}, set_session_user
-      assert_redirected_to rack_groups_url
-      assert !RackGroup.exists?(rack_group.id)
-    end
-
-    test '403 response contains missing permissions' do
-      setup_user
-      get :edit, { :id => RackGroup.first.id }, {:user => users(:one).id, :expires_at => 5.minutes.from_now}
-      assert_response :forbidden
-      assert_includes @response.body, 'edit_rack_groups'
-    end
-
-    def setup_user
-      @request.session[:user] = users(:one).id
-      users(:one).roles       = [Role.default, Role.find_by_name('Viewer')]
-    end
-
-    test 'user_with_viewer_rights_should_fail_to_edit_a_rack_group' do
-      setup_user
-      get :edit, {:id => RackGroup.first.id}
-      assert_response :forbidden
-    end
-
-    test 'user_with_viewer_rights_should_succeed_in_viewing_rack_groups' do
-      setup_user
-      get :index
-      assert_response :success
-    end
-
-    test 'user_with_viewer_rights_should_succeed_in_viewing_rack_group' do
-      setup_user
-      get :show
-      assert_response :success
-    end
-  end
-end
+# require 'test_helper'
+# 
+# module ForemanDatacenter
+#   class RackGroupsControllerTest < ActionController::TestCase
+#     setup do
+#       @model = RackGroup.first
+#     end
+# 
+#     basic_index_test
+#     basic_new_test
+#     basic_edit_test
+#     basic_pagination_per_page_test
+#     basic_pagination_rendered_test
+# 
+#     test 'test_new_submit_button_id' do
+#       get :new, {}, set_session_user
+#       assert_select "[data-id='aid_create_foreman_datacenter_rack_group']"
+#     end
+# 
+#     test 'test_new_cancel_button_id' do
+#       get :new, {}, set_session_user
+#       assert_select "[data-id='aid_datacenter_rack_groups']"
+#     end
+# 
+#     test 'test_create_invalid' do
+#       RackGroup.any_instance.stubs(:valid?).returns(false)
+#       post :create, {:rack_group => {:name => nil, :site_id => nil}}, set_session_user
+#       assert_template 'new'
+#     end
+# 
+#     test 'test_create_valid' do
+#       RackGroup.any_instance.stubs(:valid?).returns(true)
+#       post :create, {:rack_group => {:name => 'test rack_group', :site_id => Site.first.id}}, set_session_user
+#       assert_redirected_to rack_groups_url
+#     end
+# 
+#     test 'test_edit_submit_button_id' do
+#       get :edit, {:id => RackGroup.first}, set_session_user
+#       assert_select "[data-id='aid_update_foreman_datacenter_rack_group']"
+#     end
+# 
+#     test 'test_update_invalid' do
+#       RackGroup.any_instance.stubs(:valid?).returns(false)
+#       put :update, {:id => RackGroup.first.to_param, :rack_group => {:name => "3243"}}, set_session_user
+#       assert_template 'edit'
+#     end
+# 
+#     test 'test_update_valid' do
+#       Site.any_instance.stubs(:valid?).returns(true)
+#       put :update, {:id => RackGroup.first.to_param, :rack_group => {:name => RackGroup.first.name}}, set_session_user
+#       assert_redirected_to rack_groups_url
+#     end
+# 
+#     test 'test_destroy' do
+#       rack_group = RackGroup.first
+#       delete :destroy, {:id => rack_group}, set_session_user
+#       assert_redirected_to rack_groups_url
+#       assert !RackGroup.exists?(rack_group.id)
+#     end
+# 
+#     test '403 response contains missing permissions' do
+#       setup_user
+#       get :edit, { :id => RackGroup.first.id }, {:user => users(:one).id, :expires_at => 5.minutes.from_now}
+#       assert_response :forbidden
+#       assert_includes @response.body, 'edit_rack_groups'
+#     end
+# 
+#     def setup_user
+#       @request.session[:user] = users(:one).id
+#       users(:one).roles       = [Role.default, Role.find_by_name('Viewer')]
+#     end
+# 
+#     test 'user_with_viewer_rights_should_fail_to_edit_a_rack_group' do
+#       setup_user
+#       get :edit, {:id => RackGroup.first.id}
+#       assert_response :forbidden
+#     end
+# 
+#     test 'user_with_viewer_rights_should_succeed_in_viewing_rack_groups' do
+#       setup_user
+#       get :index
+#       assert_response :success
+#     end
+# 
+#     test 'user_with_viewer_rights_should_succeed_in_viewing_rack_group' do
+#       setup_user
+#       get :show
+#       assert_response :success
+#     end
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.49
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -353,7 +353,6 @@ files:
 - lib/foreman_datacenter/version.rb
 - lib/tasks/devices_tasks.rake
 - lib/tasks/foreman_datacenter_tasks.rake
-- lib/tasks/test_tasks.rake
 - locale/Makefile
 - locale/en/foreman_datacenter.po
 - locale/foreman_datacenter.pot

data/lib/tasks/test_tasks.rake

@@ -1,13 +0,0 @@
-# Tasks
-namespace :foreman_datacenter do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      Comment.create({content: "TEST ++++++++++++++++++++"})
-      ForemanDatacenter::Comment.create({content: "TEST ______________________"})
-      Comment.create(content: "TEST ################")
-      ForemanDatacenter::Comment.create(content: "TEST @@@@@@@@@@@@@@@@@@@@")
-    end
-  end
-end
-