Merge branch 'rs-spec-parity' into 'master'

Partial CE-EE parity for specs See merge request gitlab-org/gitlab-ce!31119

Merge branch 'rs-spec-parity' into 'master'
Partial CE-EE parity for specs See merge request gitlab-org/gitlab-ce!31119
0ec40a68 · Lin Jen-Shin · ba997f3c · d85c3f35 · 0ec40a68 · 0ec40a68
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -126,7 +126,7 @@

  describe "GET /:project_path/blob" do
    let(:commit) { project.repository.commit }
-    subject { project_blob_path(project, File.join(commit.id, '.gitignore'))}
+    subject { project_blob_path(project, File.join(commit.id, '.gitignore')) }

    it { is_expected.to be_allowed_for(:admin) }
    it { is_expected.to be_allowed_for(:owner).of(project) }

--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
 {
  "type": "object",
-  "required": ["dashboard", "priority", "panel_groups"],
+  "required": [
+    "dashboard",
+    "priority",
+    "panel_groups"
+  ],
  "properties": {
    "dashboard": { "type": "string" },
    "priority": { "type": "number" },

--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -574,7 +574,7 @@

      context 'Issue' do
        it 'populates assignee_ids: [] if content contains /unassign' do
-          issue.update(assignee_ids: [developer.id])
+          issue.update!(assignee_ids: [developer.id])
          _, updates = service.execute(content, issue)

          expect(updates).to eq(assignee_ids: [])
@@ -583,7 +583,7 @@

      context 'Merge Request' do
        it 'populates assignee_ids: [] if content contains /unassign' do
-          merge_request.update(assignee_ids: [developer.id])
+          merge_request.update!(assignee_ids: [developer.id])
          _, updates = service.execute(content, merge_request)

          expect(updates).to eq(assignee_ids: [])

--- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
@@ -12,6 +12,7 @@
    assign(:hidden_commit_count, 0)
    assign(:total_commit_count, merge_request.commits.count)
    assign(:project, merge_request.target_project)
+    assign(:target_project, merge_request.target_project)
    assign(:mr_presenter, merge_request.present(current_user: merge_request.author))

    allow(view).to receive(:can?).and_return(true)

--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
@@ -23,6 +23,7 @@

  before do
    assign(:project, project)
+    assign(:target_project, project)
    assign(:merge_request, closed_merge_request)
    assign(:mr_presenter, closed_merge_request.present(current_user: user))