diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-03-18 21:04:53 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-03-18 21:04:53 -0300 |
commit | 8b830b8c3b32774e8ccf562b8bc9dbce3ecf3073 (patch) | |
tree | 7898541a9362cc62f738ebc1812d022d422fe841 /spec | |
parent | b959ae553b1243e081d557b1e545d30830931e5b (diff) | |
download | gitlab-ce-8b830b8c3b32774e8ccf562b8bc9dbce3ecf3073.tar.gz |
Fix specs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/namespaces_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 5 | ||||
-rw-r--r-- | spec/features/projects_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/security/group_access_spec.rb | 2 | ||||
-rw-r--r-- | spec/finders/projects_finder_spec.rb | 2 | ||||
-rw-r--r-- | spec/finders/snippets_finder_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 1 |
8 files changed, 13 insertions, 11 deletions
diff --git a/spec/controllers/namespaces_controller_spec.rb b/spec/controllers/namespaces_controller_spec.rb index 77436958711..6350c9c6e48 100644 --- a/spec/controllers/namespaces_controller_spec.rb +++ b/spec/controllers/namespaces_controller_spec.rb @@ -15,7 +15,7 @@ describe NamespacesController do end context "when the namespace belongs to a group" do - let!(:group) { create(:group) } + let!(:group) { create(:group, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let!(:project) { create(:project, namespace: group) } context "when the group has public projects" do diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index af5d043cf02..bf5b13f2645 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -30,7 +30,7 @@ describe UploadsController do end end end - + context "when not signed in" do it "responds with status 200" do get :show, model: "user", mounted_as: "avatar", id: user.id, filename: "image.png" @@ -126,11 +126,12 @@ describe UploadsController do end context "when viewing a group avatar" do - let!(:group) { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } + let!(:group) { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } let!(:project) { create(:project, namespace: group) } context "when the group has public projects" do before do + group.update_attribute(:visibility_level, Gitlab::VisibilityLevel::PUBLIC) project.update_attribute(:visibility_level, Project::PUBLIC) end diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index ed97b6cb577..e54a5a0b72a 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -12,25 +12,25 @@ feature 'Project', feature: true do it 'parses Markdown' do project.update_attribute(:description, 'This is **my** project') visit path - expect(page).to have_css('.project-home-desc > p > strong') + expect(page).to have_css('.cover-title > p > strong') end it 'passes through html-pipeline' do project.update_attribute(:description, 'This project is the :poop:') visit path - expect(page).to have_css('.project-home-desc > p > img') + expect(page).to have_css('.cover-title > p > img') end it 'sanitizes unwanted tags' do project.update_attribute(:description, "```\ncode\n```") visit path - expect(page).not_to have_css('.project-home-desc code') + expect(page).not_to have_css('.cover-title code') end it 'permits `rel` attribute on links' do project.update_attribute(:description, 'https://google.com/') visit path - expect(page).to have_css('.project-home-desc a[rel]') + expect(page).to have_css('.cover-title a[rel]') end end diff --git a/spec/features/security/group_access_spec.rb b/spec/features/security/group_access_spec.rb index 0194581dfd1..55bbeafba33 100644 --- a/spec/features/security/group_access_spec.rb +++ b/spec/features/security/group_access_spec.rb @@ -4,7 +4,7 @@ describe 'Group access', feature: true do include AccessMatchers def group - @group ||= create(:group) + @group ||= create(:group, visibility_level: Gitlab::VisibilityLevel::PUBLIC) end def create_project(access_level) diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb index fae0da9d898..194c9543772 100644 --- a/spec/finders/projects_finder_spec.rb +++ b/spec/finders/projects_finder_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe ProjectsFinder do describe '#execute' do let(:user) { create(:user) } - let(:group) { create(:group) } + let(:group) { create(:group, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let!(:private_project) do create(:project, :private, name: 'A', path: 'A') diff --git a/spec/finders/snippets_finder_spec.rb b/spec/finders/snippets_finder_spec.rb index 7fdc5e5d7aa..b8940483dfb 100644 --- a/spec/finders/snippets_finder_spec.rb +++ b/spec/finders/snippets_finder_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe SnippetsFinder do let(:user) { create :user } let(:user1) { create :user } - let(:group) { create :group } + let(:group) { create :group, visibility_level: Gitlab::VisibilityLevel::PUBLIC } let(:project1) { create(:empty_project, :public, group: group) } let(:project2) { create(:empty_project, :private, group: group) } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 74383204250..dba7ffc8565 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -442,7 +442,7 @@ describe Project, models: true do end describe '.trending' do - let(:group) { create(:group) } + let(:group) { create(:group, :public) } let(:project1) { create(:empty_project, :public, group: group) } let(:project2) { create(:empty_project, :public, group: group) } diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index a6699cdc81c..a5d4985dc78 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -275,6 +275,7 @@ describe API::API, api: true do it 'should not allow a non-admin to use a restricted visibility level' do post api('/projects', user), @project + expect(response.status).to eq(400) expect(json_response['message']['visibility_level'].first).to( match('restricted by your GitLab administrator') |