Skip to content

Commit

Permalink
Merge pull request #7176 from skateman/automation-manager-ddf
Browse files Browse the repository at this point in the history
Replace old angular ansible tower form with a react based DDF
  • Loading branch information
h-kataria authored Jul 31, 2020
2 parents 4b9c7e6 + 5312c9d commit 9375df1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
7 changes: 5 additions & 2 deletions app/views/automation_manager/_form.html.haml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
= render :partial => 'configuration_manager/shared_form', :locals => {:url => "/automation_manager", :model => "automationManagerModel"}

- if @ems
-# FIXME: the redirect URL cannot be determined due to the explorer screen, but after a de-explorerization it should be possible to fix
= react('ProviderForm', :providerId => @ems.id.to_s, :redirect => automation_manager_path, :kind => 'automation', :title => ui_lookup(:model => 'ManageIQ::Providers::AutomationManager'))
- else
= react('ProviderForm', :redirect => automation_manager_path, :kind => 'automation', :title => ui_lookup(:model => 'ManageIQ::Providers::AutomationManager'))
8 changes: 0 additions & 8 deletions spec/controllers/automation_manager_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,6 @@
expect(right_cell_text).to eq("Edit Provider")
end

it "should display the zone field" do
new_zone = FactoryBot.create(:zone)
controller.instance_variable_set(:@provider, automation_provider1)
post :edit, :params => { :id => @automation_manager1.id }
expect(response.status).to eq(200)
expect(response.body).to include("option value=\\\"#{new_zone.name}\\\"")
end

it "should save the zone field" do
new_zone = FactoryBot.create(:zone)
controller.instance_variable_set(:@provider, automation_provider1)
Expand Down

0 comments on commit 9375df1

Please sign in to comment.