Merge branch 'winh-remove-static-fixtures' into 'master'

Remove static JavaScript HAML fixtures Closes #24753 See merge request gitlab-org/gitlab-ce!26019

Merge branch 'winh-remove-static-fixtures' into 'master'
Remove static JavaScript HAML fixtures Closes #24753 See merge request gitlab-org/gitlab-ce!26019
8046cede · Mike Greiling · 53b92141 · 28961d6a · 8046cede · 53b92141
--- a/doc/development/testing_guide/frontend_testing.md
+++ b/doc/development/testing_guide/frontend_testing.md
@@ -53,12 +53,9 @@ Remember that the performance of each test depends on the environment.
 ## Karma test suite

 GitLab uses the [Karma][karma] test runner with [Jasmine] as its test
-framework for our JavaScript unit and integration tests. For integration tests,
-we generate HTML files using RSpec (see `spec/javascripts/fixtures/*.rb` for examples).
-Some fixtures are still HAML templates that are translated to HTML files using the same mechanism (see `static_fixtures.rb`).
-Adding these static fixtures should be avoided as they are harder to keep up to date with real views.
-The existing static fixtures will be migrated over time.
-Please see [gitlab-org/gitlab-ce#24753](https://gitlab.com/gitlab-org/gitlab-ce/issues/24753) to track our progress.
+framework for our JavaScript unit and integration tests.
+We generate HTML and JSON fixtures from backend views and controllers
+using RSpec (see `spec/javascripts/fixtures/*.rb` for examples).
 Fixtures are served during testing by the [jasmine-jquery][jasmine-jquery] plugin.

 JavaScript tests live in `spec/javascripts/`, matching the folder structure

--- a/spec/javascripts/fixtures/ajax_loading_spinner.html.haml
+++ b/spec/javascripts/fixtures/ajax_loading_spinner.html.haml
-%a.js-ajax-loading-spinner{href: "http://goesnowhere.nothing/whereami", data: {remote: true}}
-  %i.fa.fa-trash-o
--- a/spec/javascripts/fixtures/balsamiq_viewer.html.haml
+++ b/spec/javascripts/fixtures/balsamiq_viewer.html.haml
-.file-content.balsamiq-viewer#js-balsamiq-viewer{ data: { endpoint: '/test' } }
--- a/spec/javascripts/fixtures/create_item_dropdown.html.haml
+++ b/spec/javascripts/fixtures/create_item_dropdown.html.haml
-.js-create-item-dropdown-fixture-root
-  %input{ name: 'variable[environment]', type: 'hidden' }
-  = dropdown_tag('some label',
-                   options: { toggle_class: 'js-dropdown-menu-toggle',
-                              content_class: 'js-dropdown-content',
-                              filter: true,
-                              dropdown_class: "dropdown-menu-selectable",
-                              footer_content: true }) do
-    %ul.dropdown-footer-list
-      %li
-        %button{ class: "dropdown-create-new-item-button js-dropdown-create-new-item" }
-          Create wildcard
-          %code
--- a/spec/javascripts/fixtures/event_filter.html.haml
+++ b/spec/javascripts/fixtures/event_filter.html.haml
-%ul.nav-links.event-filter.scrolling-tabs.nav.nav-tabs
-  %li.active
-    %a.event-filter-link{ id: "all_event_filter", title: "Filter by all", href: "/dashboard/activity"}
-      %span
-        All
-  %li
-    %a.event-filter-link{ id: "push_event_filter", title: "Filter by push events", href: "/dashboard/activity"}
-      %span
-        Push events
-  %li
-    %a.event-filter-link{ id: "merged_event_filter", title: "Filter by merge events", href: "/dashboard/activity"}
-      %span
-        Merge events
-  %li
-    %a.event-filter-link{ id: "issue_event_filter", title: "Filter by issue events", href: "/dashboard/activity"}
-      %span
-        Issue events
-  %li
-    %a.event-filter-link{ id: "comments_event_filter", title: "Filter by comments", href: "/dashboard/activity"}
-      %span
-        Comments
-  %li
-    %a.event-filter-link{ id: "team_event_filter", title: "Filter by team", href: "/dashboard/activity"}
-      %span
-        Team
\ Нет новой строки в конце файла
--- a/spec/javascripts/fixtures/gl_dropdown.html.haml
+++ b/spec/javascripts/fixtures/gl_dropdown.html.haml
-%div
-  .dropdown.inline
-    %button#js-project-dropdown.dropdown-menu-toggle{type: 'button', data: {toggle: 'dropdown'}}
-      .dropdown-toggle-text
-        Projects
-      %i.fa.fa-chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
-    .dropdown-menu.dropdown-select.dropdown-menu-selectable
-      .dropdown-title
-        %span Go to project
-        %button.dropdown-title-button.dropdown-menu-close{aria: {label: 'Close'}}
-          %i.fa.fa-times.dropdown-menu-close-icon
-      .dropdown-input
-        %input.dropdown-input-field{type: 'search', placeholder: 'Filter results'}
-        %i.fa.fa-search.dropdown-input-search
-      .dropdown-content
-      .dropdown-loading
-        %i.fa.fa-spinner.fa-spin
--- a/spec/javascripts/fixtures/gl_field_errors.html.haml
+++ b/spec/javascripts/fixtures/gl_field_errors.html.haml
-%form.gl-show-field-errors{action: 'submit', method: 'post'}
-  .form-group
-    %input.required-text{required: true, type: 'text'} Text
-  .form-group
-    %input.email{type: 'email', title: 'Please provide a valid email address.', required: true } Email
-  .form-group
-    %input.password{type: 'password', required: true} Password
-  .form-group
-    %input.alphanumeric{type: 'text', pattern: '[a-zA-Z0-9]', required: true} Alphanumeric
-  .form-group
-    %input.hidden{ type:'hidden' }
-  .form-group
-    %input.custom.gl-field-error-ignore{ type:'text' } Custom, do not validate
-  .form-group
-  %input.submit{type: 'submit'} Submit
--- a/spec/javascripts/fixtures/issuable_filter.html.haml
+++ b/spec/javascripts/fixtures/issuable_filter.html.haml
-%form.js-filter-form{action: '/user/project/issues?scope=all&state=closed'}
-  %input{id: 'utf8', name: 'utf8', value: '✓'}
-  %input{id: 'check-all-issues', name: 'check-all-issues'}
-  %input{id: 'search', name: 'search'}
-  %input{id: 'author_id', name: 'author_id'}
-  %input{id: 'assignee_id', name: 'assignee_id'}
-  %input{id: 'milestone_title', name: 'milestone_title'}
-  %input{id: 'label_name', name: 'label_name'}
--- a/spec/javascripts/fixtures/issue_sidebar_label.html.haml
+++ b/spec/javascripts/fixtures/issue_sidebar_label.html.haml
-.block.labels
-  .sidebar-collapsed-icon.js-sidebar-labels-tooltip
-  .title.hide-collapsed
-    %a.edit-link.float-right{ href: "#" }
-      Edit
-  .selectbox.hide-collapsed{ style: "display: none;" }
-    .dropdown
-      %button.dropdown-menu-toggle.js-label-select.js-multiselect{ type: "button", data: { ability_name: "issue", field_name: "issue[label_names][]", issue_update: "/root/test/issues/2.json", labels: "/root/test/labels.json", project_id: "12", show_any: "true", show_no: "true", toggle: "dropdown" } }
-        %span.dropdown-toggle-text
-          Label
-        %i.fa.fa-chevron-down
-      .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
-        .dropdown-page-one
-          .dropdown-content
-          .dropdown-loading
-            %i.fa.fa-spinner.fa-spin
--- a/spec/javascripts/fixtures/line_highlighter.html.haml
+++ b/spec/javascripts/fixtures/line_highlighter.html.haml
-.file-holder
-  .file-content
-    .line-numbers
-      - 1.upto(25) do |i|
-        %a{href: "#L#{i}", id: "L#{i}", 'data-line-number' => i}
-          %i.fa.fa-link
-          = i
-    %pre.code.highlight
-      %code
-        - 1.upto(25) do |i|
-          %span.line{id: "LC#{i}"}= "Line #{i}"
--- a/spec/javascripts/fixtures/linked_tabs.html.haml
+++ b/spec/javascripts/fixtures/linked_tabs.html.haml
-%ul.nav.nav-tabs.new-session-tabs.linked-tabs
-  %li.nav-item
-    %a.nav-link{ href: 'foo/bar/1', data: { target: 'div#tab1', action: 'tab1', toggle: 'tab' } }
-      Tab 1
-  %li.nav-item
-    %a.nav-link{ href: 'foo/bar/1/context', data: { target: 'div#tab2', action: 'tab2', toggle: 'tab' } }
-      Tab 2
-
-.tab-content
-  #tab1.tab-pane
-    Tab 1 Content
-  #tab2.tab-pane
-    Tab 2 Content
--- a/spec/javascripts/fixtures/merge_requests_show.html.haml
+++ b/spec/javascripts/fixtures/merge_requests_show.html.haml
-%a.btn-close
-
-.detail-page-description
-  .description.js-task-list-container
-    .wiki
-      %ul.task-list
-        %li.task-list-item
-          %input.task-list-item-checkbox{type: 'checkbox'}
-          Task List Item
-      %textarea.js-task-list-field
-        \- [ ] Task List Item
-
-%form.js-issuable-update{action: '/foo'}
--- a/spec/javascripts/fixtures/mini_dropdown_graph.html.haml
+++ b/spec/javascripts/fixtures/mini_dropdown_graph.html.haml
-%div.js-builds-dropdown-tests.dropdown.dropdown.js-mini-pipeline-graph
-  %button.js-builds-dropdown-button{'data-stage-endpoint' => 'foobar', data: { toggle: 'dropdown'} }
-    Dropdown
-
-  %ul.dropdown-menu.mini-pipeline-graph-dropdown-menu.js-builds-dropdown-container
-    %li.js-builds-dropdown-list.scrollable-menu
-      %ul
-
-    %li.js-builds-dropdown-loading.hidden
-      %span.fa.fa-spinner
--- a/spec/javascripts/fixtures/notebook_viewer.html.haml
+++ b/spec/javascripts/fixtures/notebook_viewer.html.haml
-.file-content#js-notebook-viewer{ data: { endpoint: '/test' } }
--- a/spec/javascripts/fixtures/oauth_remember_me.html.haml
+++ b/spec/javascripts/fixtures/oauth_remember_me.html.haml
-#oauth-container
-  %input#remember_me{ type: "checkbox" }
-
-  %a.oauth-login.twitter{ href: "http://example.com/" }
-  %a.oauth-login.github{ href: "http://example.com/" }
-  %a.oauth-login.facebook{ href: "http://example.com/?redirect_fragment=L1" }
--- a/spec/javascripts/fixtures/pdf_viewer.html.haml
+++ b/spec/javascripts/fixtures/pdf_viewer.html.haml
-.file-content#js-pdf-viewer{ data: { endpoint: '/test' } }
--- a/spec/javascripts/fixtures/pipeline_graph.html.haml
+++ b/spec/javascripts/fixtures/pipeline_graph.html.haml
-%div.pipeline-visualization.js-pipeline-graph
-  %ul.stage-column-list
-    %li.stage-column
-      .stage-name
-        %a{:href => "/"}
-          Test
-          .builds-container
-            %ul
-              %li.build
-                .curve
-                %a
-                  %svg
-                  .ci-status-text
-                    stop_review
--- a/spec/javascripts/fixtures/pipelines.html.haml
+++ b/spec/javascripts/fixtures/pipelines.html.haml
-%div
-  #pipelines-list-vue{ data: { endpoint: 'foo',
-    "help-page-path" => 'foo',
-    "help-auto-devops-path" => 'foo',
-    "empty-state-svg-path" => 'foo',
-    "error-state-svg-path" => 'foo',
-    "new-pipeline-path" => 'foo',
-    "can-create-pipeline" => 'true',
-    "has-ci" => 'foo',
-    "ci-lint-path" => 'foo',
-    "reset-cache-path" => 'foo' } }
-
--- a/spec/javascripts/fixtures/project_select_combo_button.html.haml
+++ b/spec/javascripts/fixtures/project_select_combo_button.html.haml
-.project-item-select-holder
-  %input.project-item-select{ data: { group_id: '12345' , relative_path: 'issues/new' } }
-  %a.new-project-item-link{ data: { label: 'New issue', type: 'issues' }, href: ''}
-    %i.fa.fa-spinner.spin
-  %a.new-project-item-select-button
-    %i.fa.fa-caret-down
--- a/spec/javascripts/fixtures/search_autocomplete.html.haml
+++ b/spec/javascripts/fixtures/search_autocomplete.html.haml
-.search.search-form
-  %form.form-inline
-    .search-input-container
-      .search-input-wrap
-        .dropdown
-          %input#search.search-input.dropdown-menu-toggle
-          .dropdown-menu.dropdown-select
-            .dropdown-content
-    %input{ type: "hidden", class: "js-search-project-options" }