Fix ServiceTemplate#picture= with models

[NickLaMuro]

When creating a service template with a Picture that already exists (done in some of specs in other repos), the previous form of this method would break as create_picture was not relevant for updating pictures that already exist.

This fix #should™ fix that, but more relevant eyes should probably take a look just to make sure...

Where it fails...

Currently fails in the manageiq-api specs:

• https://github.com/ManageIQ/manageiq-api/blob/f12cf95d/spec/requests/service_templates_spec.rb#L16-L22
• https://github.com/ManageIQ/manageiq-api/blob/f12cf95d/spec/requests/pictures_spec.rb#L26-L36

Links

• Introduced in: Service template picture #18689

Steps for Testing/QA

Try running the API specs with and without this change to the models and confirm that it fails without, and passes with.

[miq-bot]

Checked commit NickLaMuro@1cb062f with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 1 offense detected

spec/models/service_template_spec.rb

• ❗ - Line 1010, Col 16 - Style/BlockDelimiters - Avoid using {...} for multi-line blocks.

[himdel]

Also fixes UI specs:

  1) CatalogController tests that needs all rbac features access #st_upload_image uploads a selected png file 
     Failure/Error: expect(assigns(:flash_array).first[:message]).to include('Custom Image file "upload_image.png" successfully uploaded')
     
     NoMethodError:
       undefined method `first' for nil:NilClass
     # ./spec/controllers/catalog_controller_spec.rb:287:in `block (4 levels) in <top (required)>'

Finished in 0.30847 seconds (files took 7.25 seconds to load)
1 example, 1 failure

Failed examples:

rspec ./spec/controllers/catalog_controller_spec.rb:284

Thanks!

[himdel]

@miq-bot add_label hammer/yes

@simaishi this fixes travis failures coming from #18689 (hammer/backported)

So we may want to backport ASAP, to get hammer travis green on ui and api.

(triggered ui hammer travis just to be sure it really fails now: https://travis-ci.org/ManageIQ/manageiq-ui-classic/builds/526392856 .. it does fail)

[simaishi]

Hammer backport details:

$ git log -1
commit 40a1d86809762479e79f0f654a28b1b8507f4223
Author: Martin Povolny <mpovolny@redhat.com>
Date:   Tue Apr 30 13:31:37 2019 +0200

    Merge pull request #18705 from NickLaMuro/fix_service_template_picture_equals
    
    Fix ServiceTemplate#picture= with models
    
    (cherry picked from commit f7fc0cbfff944f8a39466d77f8c5b1f90551c542)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1702479

[himdel]

@miq-bot remove_label hammer/yes

(forgot editing comments with miq-bot commands in them leads to this :))

[jrafanie]

It's not super when super looks like return but can't be used in guard clauses. Thanks @NickLaMuro!