Change to hash rockets to support 1.8.7

theforeman · Oct 14, 2014 · a1ef1fc · a1ef1fc
1 parent 9d9f669
commit a1ef1fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/discovered_hosts_controller.rb b/app/controllers/discovered_hosts_controller.rb
@@ -20,7 +20,7 @@ def index
       format.html do
         @hosts = search.paginate(:page => params[:page])
       end
-      format.json { render :json => hosts }
+      format.json { render :json => search }
     end
   end
 

diff --git a/extra/ovirt-node-build/Vagrantfile b/extra/ovirt-node-build/Vagrantfile
@@ -7,7 +7,7 @@ if ENV['box']
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.define box[:name], primary: box[:default] do |machine|
+  config.vm.define box[:name], :primary => box[:default] do |machine|
     machine.vm.box = box[:name]
     machine.vm.hostname = "foreman-#{box[:name]}.bulder.theforeman.org"
     machine.vm.provision :shell, :path => 'build_image.sh', :args => [

diff --git a/test/unit/host_discovered_test.rb b/test/unit/host_discovered_test.rb
@@ -4,9 +4,9 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login "admin"
     FactoryGirl.create(:setting,
-                       name: 'discovery_fact',
-                       value: 'macaddress',
-                       category: 'Setting::Discovered')
+                       :name     => 'discovery_fact',
+                       :value    => 'macaddress',
+                       :category => 'Setting::Discovered')
   end
 
   test "should be able to create Host::Discovered objects" do