foreman_docker 3.1.0 → 3.2.0

data/test/integration/container_steps_test.rb

@@ -1,24 +1,124 @@
 require 'integration_test_helper'
 
-class ContainerStepsTest < ActionDispatch::IntegrationTest
-  test 'shows a link to a new compute resource if none is available' do
-    visit new_container_path
-    assert has_selector?("div.alert", :text => 'Please add a new one')
+class ContainerStepsTest < IntegrationTestWithJavascript
+  let(:wizard_state) { DockerContainerWizardState.create! }
+  let(:compute_resource) { FactoryGirl.create(:docker_cr) }
+  let(:registry) { FactoryGirl.create(:docker_registry) }
+  let(:image_search_service) { ForemanDocker::ImageSearch.new }
+  let(:image_search_results) do
+    [{ 'name' => 'my_fake_repository_result',
+       'star_count' => 300,
+       'description' => 'fake repository' }]
   end
 
-  test 'shows taxonomies tabs' do
-    visit new_container_path
-    assert has_selector?("a", :text => 'Locations') if SETTINGS[:locations_enabled]
-    assert has_selector?("a", :text => 'Organizations') if SETTINGS[:organizations_enabled]
+  let(:preliminary) do
+    DockerContainerWizardStates::Preliminary.create!(
+      :wizard_state => wizard_state,
+      :compute_resource => compute_resource
+    )
+  end
+
+  setup do
+    stub_image_existance
+    stub_registry_api
+    ImageSearchController.any_instance.stubs(:image_search_service)
+                         .returns(image_search_service)
+  end
+
+  describe 'on preliminary step' do
+    test 'it shows docker compute resources' do
+      compute_resource.save
+      visit wizard_state_step_path(:wizard_state_id => wizard_state, :id => :preliminary)
+      assert_text compute_resource.name
+    end
+
+    context 'when no compute resources are available' do
+      setup do
+        ForemanDocker::Docker.destroy_all
+      end
+
+      test 'shows a link to a new compute resource if none is available' do
+        visit wizard_state_step_path(:wizard_state_id => wizard_state, :id => :preliminary)
+        assert has_selector?("div.alert", :text => 'Please add a new one')
+      end
+    end
+
+    test 'shows taxonomies tabs' do
+      visit wizard_state_step_path(:wizard_state_id => wizard_state, :id => :preliminary)
+      assert has_selector?("a", :text => 'Locations') if SETTINGS[:locations_enabled]
+      assert has_selector?("a", :text => 'Organizations') if SETTINGS[:organizations_enabled]
+    end
+  end
+
+  describe 'on image step' do
+    ['hub', 'registry'].each do |tab|
+      describe "on #{tab} tab" do
+        let(:image_field_id) { "#{tab}_docker_container_wizard_states_image_repository_name" }
+        let(:tag_field_id) { "#{tab}_docker_container_wizard_states_image_tag" }
+
+        setup do
+          registry.save
+          wizard_state.preliminary = preliminary
+          visit wizard_state_step_path(:wizard_state_id => wizard_state, :id => :image)
+          find("##{tab}_tab").click
+
+          if tab == 'registry'
+            find("#docker_container_wizard_states_image_registry_id option:last-child", :visible => false)
+              .select_option
+          end
+        end
+
+        test 'clicking on search loads repositories' do
+          image_search_service.expects(:search).at_least(2)
+                              .returns(image_search_results)
+          fill_in image_field_id, :with => "fake"
+          wait_for_ajax
+          find("#search_repository_button_#{tab}").click
+          wait_for_ajax
+          assert_text 'my_fake_repository_result'
+        end
+
+        describe 'autcomplete' do
+          describe 'for image name' do
+            test 'entering text triggers autocomplete' do
+              image_search_service.expects(:search)
+                                  .returns(image_search_results)
+              fill_in image_field_id, :with => 'fa'
+              wait_for_ajax
+              has_selector?('.ui-autocomplete a', :text => 'my_fake_repository_result')
+            end
+
+            if tab == 'registry'
+              context 'when no registry is selected' do
+                test 'it does not trigger a autocomplete' do
+                  image_search_service.expects(:search).never
+                  find("#docker_container_wizard_states_image_registry_id option:first-child", :visible => false).select_option
+                  fill_in image_field_id, :with => 'fa'
+                  wait_for_ajax
+                  has_no_selector?('.ui-autocomplete a', :text => 'my_fake_repository_result')
+                end
+              end
+            end
+          end
+
+          describe 'for tag' do
+            let(:image_name) { 'fake' }
+            let(:tag_snippet) { 'lat' }
+
+            setup do
+              fill_in image_field_id, :with => 'fake'
+            end
+
+            test 'it searches for tags' do
+              image_search_service.expects(:search).at_least(2)
+                                  .returns(['latest'])
+              fill_in tag_field_id, :with => tag_snippet
+              wait_for_ajax
+              has_selector?('.ui-autocomplete a', :text => 'latest')
+            end
+          end
+        end
+      end
+    end
   end
-  # test 'clicking on search loads repositories' do
-  #   Capybara.javascript_driver = :webkit
-  #   container = FactoryGirl.create(:container)
-  #   visit container_step_path(:container_id => container.id, :id => :repository)
-  #   ComputeResource.any_instance.expects(:search).returns([{'name' => 'my_fake_repository_result',
-  #                                                           'star_count' => 300,
-  #                                                           'description' => 'fake repository'}])
-  #   click_button 'search_repository'
-  #   assert has_link? 'my_fake_repository_result'
-  # end
 end

data/test/integration/registry_creation_test.rb

@@ -0,0 +1,19 @@
+require 'integration_test_helper'
+
+class RegistryiCreationTest < IntegrationTestWithJavascript
+  let(:registry_values) { FactoryGirl.build(:docker_registry) }
+
+  setup do
+    DockerRegistry.any_instance.stubs(:attempt_login).returns(true)
+    visit new_registry_path
+  end
+
+  test 'can create a registy' do
+    assert_difference('DockerRegistry.count') do
+      fill_in 'docker_registry_name', with: registry_values.name
+      fill_in 'docker_registry_url', with: registry_values.url
+      page.find('#new_docker_registry .btn-primary').click
+      wait_for_ajax
+    end
+  end
+end

data/test/units/docker_container_wizard_states/image_test.rb

@@ -32,7 +32,6 @@ module DockerContainerWizardStates
       Service::RegistryApi.stubs(:docker_hub).returns(docker_hub)
     end
 
-
     describe 'it validates that the image is available' do
       test 'validates via the image_search_service' do
         DockerContainerWizardStates::Image.any_instance

data/test/units/docker_registry_test.rb

@@ -55,12 +55,4 @@ class DockerRegistryTest < ActiveSupport::TestCase
       assert_kind_of Service::RegistryApi, api
     end
   end
-
-  describe '#api' do
-    let(:api) { subject.api }
-
-    test 'returns a RegistryApi instance' do
-      assert_kind_of Service::RegistryApi, api
-    end
-  end
 end

data/test/units/registry_api_test.rb

@@ -30,6 +30,15 @@ class RegistryApiTest < ActiveSupport::TestCase
         assert_equal password, subject.connection.options[:password]
       end
     end
+
+    context 'verify ssl is set' do
+      let(:verify_ssl) { [true, false].sample }
+      subject { Service::RegistryApi.new(url: url, verify_ssl: verify_ssl) }
+
+      test 'it passes it as ssl_verify_peer' do
+        assert_equal verify_ssl, subject.connection.options[:ssl_verify_peer]
+      end
+    end
   end
 
   describe '#get' do
@@ -185,8 +194,11 @@ class RegistryApiTest < ActiveSupport::TestCase
 
   describe '#ok?' do
     test 'calls the API via #get with /v1/' do
+      params = subject.send(:default_connection_options)
+                      .merge(subject.send(:credentials))
+                      .merge(path: '/v1/')
       subject.connection.expects(:get)
-             .with('/', nil, Service::RegistryApi::DEFAULTS[:connection].merge(path: '/v1/'))
+             .with('/', nil, params)
              .returns('Docker Registry API')
       assert subject.ok?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.49.1
 description: Provision and manage Docker containers and images from Foreman.
 email:
 - dlobatog@redhat.com, abenari@redhat.com
@@ -91,7 +91,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/foreman_docker/image_step.js
+- app/assets/javascripts/foreman_docker/container_image_search.js
+- app/assets/javascripts/foreman_docker/create_registry.js
 - app/assets/stylesheets/foreman_docker/autocomplete.css.scss
 - app/assets/stylesheets/foreman_docker/terminal.css.scss
 - app/controllers/api/v2/containers_controller.rb
@@ -189,6 +190,7 @@ files:
 - db/migrate/20150814205620_change_container_column_type.rb
 - db/migrate/20160605133025_create_docker_parameters.rb
 - db/migrate/20160605134652_move_parameters_to_docker_parameters.rb
+- db/migrate/20170508130316_add_verify_ssl_option_to_docker_registries.rb
 - lib/foreman_docker.rb
 - lib/foreman_docker/engine.rb
 - lib/foreman_docker/version.rb
@@ -226,6 +228,7 @@ files:
 - test/functionals/image_search_controller_test.rb
 - test/integration/container_steps_test.rb
 - test/integration/container_test.rb
+- test/integration/registry_creation_test.rb
 - test/test_plugin_helper.rb
 - test/units/container_remover_test.rb
 - test/units/container_test.rb
@@ -272,15 +275,16 @@ test_files:
 - test/functionals/image_search_controller_test.rb
 - test/integration/container_test.rb
 - test/integration/container_steps_test.rb
+- test/integration/registry_creation_test.rb
 - test/units/container_remover_test.rb
 - test/units/foreman_docker/compute_resource_extensions_test.rb
 - test/units/foreman_docker/docker_test.rb
 - test/units/utility_service_test.rb
 - test/units/container_test.rb
-- test/units/docker_registry_test.rb
 - test/units/image_search_service_test.rb
 - test/units/containers_service_test.rb
 - test/units/docker_container_wizard_states/image_test.rb
+- test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
 - test/test_plugin_helper.rb
 - ".rubocop.yml"

data/app/assets/javascripts/foreman_docker/image_step.js

@@ -1,175 +0,0 @@
-$(document).ready(function() {
-  setupAutoComplete("hub");
-  setupAutoComplete("registry");
-  $('#hub_tab').click( function() {
-      $('#docker_container_wizard_states_image_registry_id').val('');
-  });
-});
-
-function setupAutoComplete(registryType) {
-  var tag = getTag(registryType),
-      repo = getRepo(registryType);
-
-  tag.autocomplete({
-    source: [],
-    autoFocus: true,
-    delay: 500,
-    minLength: 0
-  }).focus( function() {
-    $(this).data("uiAutocomplete").search($(this).val());
-  });
-
-  repo.autocomplete({
-    source: function( request, response ) { autoCompleteRepo(repo); },
-    delay: 500,
-    minLength: 1
-  });
-}
-
-function paramsForSearch(registryType) {
-  var image = getRepo(registryType),
-      tag = getTag(registryType),
-      registryId = $('#docker_container_wizard_states_image_registry_id').val(),
-      params = {
-        registry: registryType,
-        search: image.val()
-      }
-
-  if (tag.val() != '') {
-    params.search = image.val() + ':' + tag.val();
-  };
-
-  if (registryType == 'registry' && registryId != '') {
-    params.registry_id = registryId;
-  };
-
-  return params;
-}
-
-function autoCompleteRepo(item) {
-  var registryType = $(item).data('registry'),
-      search_add_on = getImageConfirmation(registryType),
-      tag = getTag(registryType),
-      params = paramsForSearch(registryType);
-
-  if (params.search == '' ||
-      (registryType == 'registry' && typeof params.registry_id == 'undefined')) {
-    return;
-  }
-
-  // Patternfly spinner uses 'float: left' and moves it to the left of the
-  // search button. Instead, we use FontAwesome's spinner to keep it at
-  // the right.
-  search_add_on.attr('class', 'fa fa-spin fa-circle-o-notch');
-
-  $.ajax({
-    type:'get',
-    url: $(item).attr('data-url'),
-    data: params,
-    success:function (result) {
-       if(result == 'true'){
-        search_add_on.attr('title', 'Image found in the compute resource');
-        search_add_on.attr('class', 'pficon pficon-ok');
-        setWaitingText('Image found: <strong>' + item.val() + '</strong>. Retrieving available tags, please wait...', registryType);
-        setAutocompleteTags(registryType);
-      } else {
-        search_add_on.attr('title', 'Image NOT found in the compute resource');
-        search_add_on.attr('class', 'pficon pficon-error-circle-o');
-        tag.autocomplete('option', 'source', []);
-      }
-    },
-    error: function(result) {
-      $.jnotify(result.responseText, "error", true);
-    }
-  });
-}
-
-function setAutocompleteTags(registryType) {
-  var registryType = registryType,
-      tag = getTag(registryType),
-      source = [];
-
-  tag.addClass('spinner-label');
-  tag.val('');
-
-  $.getJSON( tag.data("url"),
-      paramsForSearch(registryType),
-      function(data) {
-        getSearchSpinner(registryType).hide();
-        tag.removeClass('spinner-label');
-        $.each( data, function(index, value) {
-          source.push({label: value.label, value: value.value});
-        });
-        tag.focus();
-      })
-      .error(function(result) {
-        $.jnotify(result.responseText, "error", true);
-      });
-  tag.autocomplete('option', 'source', source);
-}
-
-function searchRepo(item) {
-  var registryType = $(item).data('registry'),
-      results = getRepositorySearchResults(registryType),
-      search = getRepo(registryType),
-      searching_spinner = getSearchSpinner(registryType);
-  setWaitingText('<strong>Searching</strong> in the hub, this can be slow, please wait...', registryType);
-  results.html('');
-  results.show();
-  $.ajax({
-    type:'get',
-    dataType:'text',
-    url: $(item).attr('data-url'),
-    data: paramsForSearch(registryType),
-    success: function (result) {
-      results.html(result);
-    },
-    error: function(result) {
-      $.jnotify(result.responseText, "error", true);
-    },
-    complete: function (result) {
-      searching_spinner.hide();
-    }
-  });
-}
-
-function repoSelected(item) {
-  var registryType = "hub";
-  if ($(item).data("hub") !== true) {
-    registryType = "registry";
-  }
-
-  getRepositorySearchResults(registryType).hide();
-  setWaitingText('Image selected: <strong>' + item.text + '</strong>. Retrieving available tags, please wait...', registryType);
-  getRepo(registryType).val(item.text);
-  setAutocompleteTags(registryType);
-}
-
-function setWaitingText(string, registryType) {
-  getWaitText(registryType).html(string);
-  getSearchSpinner(registryType).show();
-}
-
-function getTag(registryType) {
-  return  $('form[data-registry="' + registryType + '"] input[data-tag]:first');
-}
-
-function getRepo(registryType) {
-  return  $('form[data-registry="' + registryType + '"] input[data-search]:first');
-}
-
-function getSearchSpinner(registryType) {
-  return  $('form[data-registry="' + registryType + '"] [data-search-spinner]:first');
-}
-
-function getRepositorySearchResults(registryType) {
-  return  $('form[data-registry="' + registryType + '"] [data-repository-search-results]:first');
-}
-
-function getImageConfirmation(registryType) {
-  return  $('form[data-registry="' + registryType + '"] #image-confirmation');
-}
-
-function getWaitText(registryType) {
-  return  $('form[data-registry="' + registryType + '"] [data-wait-text]:first');
-}