Changed anchor not to have the js prefix, add i18n

2018-04-17 11:37:16 -05:00 · 2018-04-17 11:37:16 -05:00 · ea7127dea9
parent 4745361c1f
commit ea7127dea9
9 changed files with 35 additions and 35 deletions
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@ -260,7 +260,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
    if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout
      OpenStruct.new(enabled: auto_devops_enabled?,
                     label: auto_devops_enabled? ? _('Auto DevOps enabled') : _('Enable Auto DevOps'),
-                     link: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+                     link: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
    elsif auto_devops_enabled?
      OpenStruct.new(enabled: true,
                     label: _('Auto DevOps enabled'),
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@ -22,7 +22,7 @@

      %hr
      %p
-        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'))
+        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'))
        - link_to_add_kubernetes_cluster = link_to(s_('AutoDevOps|add a Kubernetes cluster'), new_project_cluster_path(@project))
        = s_('AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}.').html_safe % { link_to_auto_devops_settings: link_to_auto_devops_settings, link_to_add_kubernetes_cluster: link_to_add_kubernetes_cluster }

--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@ -5,6 +5,7 @@
      %fieldset.builds-feature
        .form-group
          - message = auto_devops_warning_message(@project)
+          - ci_file_formatted = '<code>.gitlab-ci.yml</code>'.html_safe
          - if message
            %p.settings-message.text-center
              = message.html_safe
@ -12,29 +13,28 @@
            .radio
              = form.label :enabled_true do
                = form.radio_button :enabled, 'true'
-                %strong Enable Auto DevOps
+                %strong= s_('CICD|Enable Auto DevOps')
                %br
-                %span.descr
-                  The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
+                = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }

            .radio
              = form.label :enabled_false do
                = form.radio_button :enabled, 'false'
-                %strong Disable Auto DevOps
+                %strong= s_('CICD|Disable Auto DevOps')
                %br
-                %span.descr
-                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
+                = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }

            .radio
              = form.label :enabled_ do
                = form.radio_button :enabled, ''
-                %strong Instance default (#{Gitlab::CurrentSettings.auto_devops_enabled? ? 'enabled' : 'disabled'})
+                %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }
                %br
-                %span.descr
-                  Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
+                = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }

-              %p.prepend-top-10.append-bottom-10
-                You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
-              = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
+            = form.label :domain, class:"prepend-top-10" do
+              = _('Domain')
+            = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
+            .help-block
+              = s_('CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.')

-          = f.submit 'Save changes', class: "btn btn-save prepend-top-15"
+          = f.submit 'Save changes', class: "btn btn-success prepend-top-15"
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@ -5,7 +5,7 @@
 - expanded = Rails.env.test?
 - general_expanded = @project.errors.empty? ? expanded : true

-%section.settings.general-ci-settings.no-animate{ class: ('expanded' if general_expanded) }
+%section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) }
  .settings-header
    %h4
      General pipelines settings
@ -16,15 +16,15 @@
  .settings-content
    = render 'form'

-%section.settings#js-autodevops-settings.autodevops-settings.no-animate{ class: ('expanded' if expanded) }
+%section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
  .settings-header
    %h4
-      Auto DevOps (Beta)
-    %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = s_('CICD|Auto DevOps (Beta)')
+    %button.btn.btn-default.js-settings-toggle{ type: 'button' }
+      = expanded ? _('Collapse') : _('Expand')
    %p
-      Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
-      = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
+      = s_('CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.')
+      = link_to s_('CICD|Learn more about Auto DevOps'), help_page_path('topics/autodevops/index.md')
  .settings-content
    = render 'autodevops_form'

--- a/app/views/shared/_auto_devops_callout.html.haml
+++ b/app/views/shared/_auto_devops_callout.html.haml
@ -9,7 +9,7 @@
      - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer')
      = s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link }
    .banner-buttons
-      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'), class: 'btn js-close-callout'
+      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'), class: 'btn js-close-callout'

  %button.btn-transparent.banner-close.close.js-close-callout{ type: 'button',
  'aria-label' => 'Dismiss Auto DevOps box' }
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@ -29,13 +29,13 @@ describe "Projects > Settings > Pipelines settings" do

      fill_in('Test coverage parsing', with: 'coverage_regex')

-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
        click_on 'Save changes'
      end

      expect(page.status_code).to eq(200)

-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
        expect(page).to have_button('Save changes', disabled: false)
      end

@ -46,13 +46,13 @@ describe "Projects > Settings > Pipelines settings" do
      visit project_settings_ci_cd_path(project)

      page.check('Auto-cancel redundant, pending pipelines')
-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
        click_on 'Save changes'
      end

      expect(page.status_code).to eq(200)

-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
        expect(page).to have_button('Save changes', disabled: false)
      end

@ -64,7 +64,7 @@ describe "Projects > Settings > Pipelines settings" do
      it 'update auto devops settings' do
        visit project_settings_ci_cd_path(project)

-        page.within '.autodevops-settings' do
+        page.within '#autodevops-settings' do
          fill_in('project_auto_devops_attributes_domain', with: 'test.com')
          page.choose('project_auto_devops_attributes_enabled_false')
          click_on 'Save changes'
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@ -65,7 +65,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
      describe 'Auto DevOps button' do
        it '"Enable Auto DevOps" button linked to settings page' do
          page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
          end
        end

@ -75,7 +75,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
          visit project_path(project)

          page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
          end
        end
      end
@ -212,7 +212,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
      describe 'Auto DevOps button' do
        it '"Enable Auto DevOps" button linked to settings page' do
          page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
          end
        end

@ -222,7 +222,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
          visit project_path(project)

          page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
          end
        end

--- a/spec/javascripts/settings_panels_spec.js
+++ b/spec/javascripts/settings_panels_spec.js
@ -13,9 +13,9 @@ describe('Settings Panels', () => {
    });

    it('should expand linked hash fragment panel', () => {
-      location.hash = '#js-autodevops-settings';
+      location.hash = '#autodevops-settings';

-      const pipelineSettingsPanel = document.querySelector('#js-autodevops-settings');
+      const pipelineSettingsPanel = document.querySelector('#autodevops-settings');
      // Our test environment automatically expands everything so we need to clear that out first
      pipelineSettingsPanel.classList.remove('expanded');

--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@ -321,7 +321,7 @@ describe ProjectPresenter do

          expect(presenter.autodevops_anchor_data).to eq(OpenStruct.new(enabled: false,
                                                                        label: 'Enable Auto DevOps',
-                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings')))
+                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'autodevops-settings')))
        end
      end
    end