Merge branch 'ce-to-ee-2018-02-20' into 'master'

CE upstream - 2018-02-20 12:23 UTC

See merge request gitlab-org/gitlab-ee!4622

app/models/deployment.rb

 class Deployment < ActiveRecord::Base
   include InternalId
 
-  belongs_to :project, required: true, validate: true
-  belongs_to :environment, required: true, validate: true
+  belongs_to :project, required: true
+  belongs_to :environment, required: true
   belongs_to :user
   belongs_to :deployable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
 

app/models/environment.rb

@@ -4,7 +4,7 @@ class Environment < ActiveRecord::Base
   NUMBERS = '0'..'9'
   SUFFIX_CHARS = LETTERS.to_a + NUMBERS.to_a
 
-  belongs_to :project, required: true, validate: true
+  belongs_to :project, required: true
 
   has_many :deployments, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 

changelogs/unreleased/remove-unnecessary-validate-project.yml

+---
+title: 'Remove unecessary validate: true from belongs_to :project'
+merge_request:
+author:
+type: fixed

features/project/network_graph.feature

-Feature: Project Network Graph
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And I visit project "Shop" network page
-
-  @javascript
-  Scenario: I should see project network
-    Then page should have network graph
-    And page should select "master" in select box
-    And page should have "master" on graph
-
-  @javascript
-  Scenario: I should see project network with 'test' branch
-    When I visit project network page on branch 'test'
-    Then page should have 'test' on graph
-
-  @javascript
-  Scenario: I should switch "branch" and "tag"
-    When I switch ref to "feature"
-    Then page should select "feature" in select box
-    And page should have "feature" on graph
-    When I switch ref to "v1.0.0"
-    Then page should select "v1.0.0" in select box
-    And page should have "v1.0.0" on graph
-
-  @javascript
-  Scenario: I should looking for a commit by SHA
-    When I looking for a commit by SHA of "v1.0.0"
-    Then page should have network graph
-    And page should select "master" in select box
-    And page should have "v1.0.0" on graph
-
-  @javascript
-  Scenario: I should filter selected tag
-    When I switch ref to "v1.0.0"
-    Then page should have "v1.0.0" in title
-    Then page should have content not containing "v1.0.0"
-    When click "Show only selected branch" checkbox
-    Then page should only have content from "v1.0.0"
-    When click "Show only selected branch" checkbox
-    Then page should have content not containing "v1.0.0"
-
-  Scenario: I should fail to look for a commit
-    When I look for a commit by ";"
-    Then I should see non-existent git revision error message

features/steps/project/network_graph.rb

-class Spinach::Features::ProjectNetworkGraph < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-
-  step 'page should have network graph' do
-    expect(page).to have_selector ".network-graph"
-  end
-
-  When 'I visit project "Shop" network page' do
-    # Stub Graph max_size to speed up test (10 commits vs. 650)
-    allow(Network::Graph).to receive(:max_count).and_return(10)
-
-    @project = Project.find_by(name: "Shop")
-    visit project_network_path(@project, "master")
-  end
-
-  step "I visit project network page on branch 'test'" do
-    visit project_network_path(@project, "'test'")
-  end
-
-  step 'page should select "master" in select box' do
-    expect(page).to have_selector '.dropdown-menu-toggle', text: "master"
-  end
-
-  step 'page should select "v1.0.0" in select box' do
-    expect(page).to have_selector '.dropdown-menu-toggle', text: "v1.0.0"
-  end
-
-  step 'page should have "master" on graph' do
-    page.within '.network-graph' do
-      expect(page).to have_content 'master'
-    end
-  end
-
-  step "page should have 'test' on graph" do
-    page.within '.network-graph' do
-      expect(page).to have_content "'test'"
-    end
-  end
-
-  When 'I switch ref to "feature"' do
-    first('.js-project-refs-dropdown').click
-
-    page.within '.project-refs-form' do
-      click_link 'feature'
-    end
-  end
-
-  When 'I switch ref to "v1.0.0"' do
-    first('.js-project-refs-dropdown').click
-
-    page.within '.project-refs-form' do
-      click_link 'v1.0.0'
-    end
-  end
-
-  When 'click "Show only selected branch" checkbox' do
-    find('#filter_ref').click
-  end
-
-  step 'page should have content not containing "v1.0.0"' do
-    page.within '.network-graph' do
-      expect(page).to have_content 'Change some files'
-    end
-  end
-
-  step 'page should have "v1.0.0" in title' do
-    expect(page).to have_css 'title', text: 'Graph · v1.0.0', visible: false
-  end
-
-  step 'page should only have content from "v1.0.0"' do
-    page.within '.network-graph' do
-      expect(page).not_to have_content 'Change some files'
-    end
-  end
-
-  step 'page should select "feature" in select box' do
-    expect(page).to have_selector '.dropdown-menu-toggle', text: "feature"
-  end
-
-  step 'page should select "v1.0.0" in select box' do
-    expect(page).to have_selector '.dropdown-menu-toggle', text: "v1.0.0"
-  end
-
-  step 'page should have "feature" on graph' do
-    page.within '.network-graph' do
-      expect(page).to have_content 'feature'
-    end
-  end
-
-  When 'I looking for a commit by SHA of "v1.0.0"' do
-    page.within ".network-form" do
-      fill_in 'extended_sha1', with: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
-      find('button').click
-    end
-    sleep 2
-  end
-
-  step 'page should have "v1.0.0" on graph' do
-    page.within '.network-graph' do
-      expect(page).to have_content 'v1.0.0'
-    end
-  end
-
-  When 'I look for a commit by ";"' do
-    page.within ".network-form" do
-      fill_in 'extended_sha1', with: ';'
-      find('button').click
-    end
-  end
-
-  step 'I should see non-existent git revision error message' do
-    expect(page).to have_selector '.flash-alert', text: "Git revision ';' does not exist."
-  end
-end

spec/features/projects/network_graph_spec.rb

+require 'spec_helper'
+
+describe 'Project Network Graph', :js do
+  let(:user) { create :user }
+  let(:project) { create :project, :repository, namespace: user.namespace }
+
+  before do
+    sign_in(user)
+
+    # Stub Graph max_size to speed up test (10 commits vs. 650)
+    allow(Network::Graph).to receive(:max_count).and_return(10)
+  end
+
+  context 'when branch is master' do
+    def switch_ref_to(ref_name)
+      first('.js-project-refs-dropdown').click
+
+      page.within '.project-refs-form' do
+        click_link ref_name
+      end
+    end
+
+    def click_show_only_selected_branch_checkbox
+      find('#filter_ref').click
+    end
+
+    before do
+      visit project_network_path(project, 'master')
+    end
+
+    it 'renders project network' do
+      expect(page).to have_selector ".network-graph"
+      expect(page).to have_selector '.dropdown-menu-toggle', text: "master"
+      page.within '.network-graph' do
+        expect(page).to have_content 'master'
+      end
+    end
+
+    it 'switches ref to branch' do
+      switch_ref_to('feature')
+
+      expect(page).to have_selector '.dropdown-menu-toggle', text: 'feature'
+      page.within '.network-graph' do
+        expect(page).to have_content 'feature'
+      end
+    end
+
+    it 'switches ref to tag' do
+      switch_ref_to('v1.0.0')
+
+      expect(page).to have_selector '.dropdown-menu-toggle', text: 'v1.0.0'
+      page.within '.network-graph' do
+        expect(page).to have_content 'v1.0.0'
+      end
+    end
+
+    it 'renders by commit sha of "v1.0.0"' do
+      page.within ".network-form" do
+        fill_in 'extended_sha1', with: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
+        find('button').click
+      end
+
+      expect(page).to have_selector ".network-graph"
+      expect(page).to have_selector '.dropdown-menu-toggle', text: "master"
+      page.within '.network-graph' do
+        expect(page).to have_content 'v1.0.0'
+      end
+    end
+
+    it 'filters select tag' do
+      switch_ref_to('v1.0.0')
+
+      expect(page).to have_css 'title', text: 'Graph · v1.0.0', visible: false
+      page.within '.network-graph' do
+        expect(page).to have_content 'Change some files'
+      end
+
+      click_show_only_selected_branch_checkbox
+
+      page.within '.network-graph' do
+        expect(page).not_to have_content 'Change some files'
+      end
+
+      click_show_only_selected_branch_checkbox
+
+      page.within '.network-graph' do
+        expect(page).to have_content 'Change some files'
+      end
+    end
+
+    it 'renders error message when sha commit not exists' do
+      page.within ".network-form" do
+        fill_in 'extended_sha1', with: ';'
+        find('button').click
+      end
+
+      expect(page).to have_selector '.flash-alert', text: "Git revision ';' does not exist."
+    end
+  end
+
+  it 'renders project network with test branch' do
+    visit project_network_path(project, "'test'")
+
+    page.within '.network-graph' do
+      expect(page).to have_content "'test'"
+    end
+  end
+end