diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index d734e60682a31fa1a1d88c559ce1bdd4d6dfa424..c638c32a654ca59db7ade68ee4171c8f7106715c 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -52,7 +52,7 @@
%li
%span.light fs:
%strong
- = @repository.path_to_repo
+ = @project.repository.path_to_repo
%li
%span.light Size
diff --git a/db/schema.rb b/db/schema.rb
index 9d1d7d9b823f548f6546b36243e9c042d16f4d08..11ae4815801c57a399d2c0df4a5911dba6da199a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160316204731) do
+ActiveRecord::Schema.define(version: 20160320204112) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/spec/controllers/groups/avatars_controller_spec.rb b/spec/controllers/groups/avatars_controller_spec.rb
index 3dac134a73180aa5c46546cb0f7f9d708bfb04e5..91d639218e59e263e378fb9ecca081ec5b23229d 100644
--- a/spec/controllers/groups/avatars_controller_spec.rb
+++ b/spec/controllers/groups/avatars_controller_spec.rb
@@ -2,9 +2,10 @@ require 'spec_helper'
describe Groups::AvatarsController do
let(:user) { create(:user) }
- let(:group) { create(:group, owner: user, 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")) }
before do
+ group.add_owner(user)
sign_in(user)
end
diff --git a/spec/controllers/namespaces_controller_spec.rb b/spec/controllers/namespaces_controller_spec.rb
index 41ae6063ae07fc71fe35f533aedff2677e4df535..27e9afe582e806f30d5147056e99bbe2e2d06ad0 100644
--- a/spec/controllers/namespaces_controller_spec.rb
+++ b/spec/controllers/namespaces_controller_spec.rb
@@ -18,10 +18,6 @@ describe NamespacesController do
let!(:group) { create(:group) }
context "when the group is public" do
- before do
- group.update_attribute(:visibility_level, Group::PUBLIC)
- end
-
context "when not signed in" do
it "redirects to the group's page" do
get :show, id: group.path
@@ -44,10 +40,14 @@ describe NamespacesController do
end
context "when the group is private" do
+ before do
+ group.update_attribute(:visibility_level, Group::PRIVATE)
+ end
+
context "when not signed in" do
- it "does not redirect to the sign in page" do
+ it "redirects to the sign in page" do
get :show, id: group.path
- expect(response).not_to redirect_to(new_user_session_path)
+ expect(response).to redirect_to(new_user_session_path)
end
end
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 0947744fc47281a6bac6d92169766484017dcd68..73858e6f0637de5c7127798abe757a9e4c42e601 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -129,10 +129,6 @@ describe UploadsController do
let!(:group) { create(:group, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) }
context "when the group is public" do
- before do
- group.update_attribute(:visibility_level, Gitlab::VisibilityLevel::PUBLIC)
- end
-
context "when not signed in" do
it "responds with status 200" do
get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
@@ -155,6 +151,10 @@ describe UploadsController do
end
context "when the group is private" do
+ before do
+ group.update_attribute(:visibility_level, Gitlab::VisibilityLevel::PRIVATE)
+ end
+
context "when signed in" do
before do
sign_in(user)
@@ -162,7 +162,7 @@ describe UploadsController do
context "when the user has access to the project" do
before do
- project.add_developer(user)
+ group.add_developer(user)
end
context "when the user is blocked" do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 0591aa089d8c2e67bec83211d4eef602dbf8c757..208922b5a8e00c07a263aaf22fad3c875f1b113a 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -59,18 +59,17 @@ describe Group, models: true do
describe 'scopes' do
let!(:private_group) { create(:group, :private) }
let!(:internal_group) { create(:group, :internal) }
- let!(:public_group) { create(:group, :public) }
describe 'public_only' do
subject { described_class.public_only.to_a }
- it{ is_expected.to eq([public_group]) }
+ it{ is_expected.to eq([group]) }
end
describe 'public_and_internal_only' do
subject { described_class.public_and_internal_only.to_a }
- it{ is_expected.to eq([public_group, internal_group]) }
+ it{ is_expected.to eq([group, internal_group]) }
end
end
diff --git a/spec/services/create_snippet_service_spec.rb b/spec/services/create_snippet_service_spec.rb
index c800dea04fa14786e748711070d6a86cb6c9903a..7a850066bf86b8e275cc360710f63e87e59190fb 100644
--- a/spec/services/create_snippet_service_spec.rb
+++ b/spec/services/create_snippet_service_spec.rb
@@ -23,7 +23,7 @@ describe CreateSnippetService, services: true do
snippet = create_snippet(nil, @user, @opts)
expect(snippet.errors.messages).to have_key(:visibility_level)
expect(snippet.errors.messages[:visibility_level].first).to(
- match('Public visibility has been restricted')
+ match('has been restricted')
)
end
diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb
index 9d427ff2d90ee1b33a5f86ff34471368cdd12b87..7732482cdaa3b9055e8afd15cea4da5da57a311a 100644
--- a/spec/services/groups/update_service_spec.rb
+++ b/spec/services/groups/update_service_spec.rb
@@ -6,9 +6,8 @@ describe Groups::UpdateService, services: true do
let!(:internal_group) { create(:group, :internal) }
let!(:public_group) { create(:group, :public) }
- describe "execute" do
+ describe "#execute" do
context "project visibility_level validation" do
-
context "public group with public projects" do
let!(:service) { described_class.new(public_group, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL ) }
@@ -18,33 +17,32 @@ describe Groups::UpdateService, services: true do
end
it "cant downgrade permission level" do
- expect(service.execute).to be_falsy
expect(public_group.errors.count).to eq(2)
end
end
context "internal group with internal project" do
- let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE ) }
-
- before do
- internal_group.add_user(user, Gitlab::Access::MASTER)
- create(:project, :internal, group: internal_group)
- end
-
- it "cant downgrade permission level" do
- expect(service.execute).to be_falsy
- expect(internal_group.errors.count).to eq(2)
- end
+ let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE ) }
+
+ before do
+ internal_group.add_user(user, Gitlab::Access::MASTER)
+ create(:project, :internal, group: internal_group)
+ end
+
+ it "cant downgrade permission level" do
+ expect(internal_group.errors.count).to eq(2)
end
+ end
end
end
context "unauthorized visibility_level validation" do
let!(:service) { described_class.new(internal_group, user, visibility_level: 99 ) }
- before { internal_group.add_user(user, Gitlab::Access::MASTER) }
+ before do
+ internal_group.add_user(user, Gitlab::Access::MASTER)
+ end
it "does not change permission level" do
- expect(service.execute).to be_falsy
expect(internal_group.errors.count).to eq(1)
end
end
diff --git a/spec/services/update_snippet_service_spec.rb b/spec/services/update_snippet_service_spec.rb
index 48d114896d0ff5f8a33c21390053e0d43499f697..37c2e861362b6b65b661412f29371e751b1100ad 100644
--- a/spec/services/update_snippet_service_spec.rb
+++ b/spec/services/update_snippet_service_spec.rb
@@ -25,7 +25,7 @@ describe UpdateSnippetService, services: true do
update_snippet(@project, @user, @snippet, @opts)
expect(@snippet.errors.messages).to have_key(:visibility_level)
expect(@snippet.errors.messages[:visibility_level].first).to(
- match('Public visibility has been restricted')
+ match('has been restricted')
)
expect(@snippet.visibility_level).to eq(old_visibility)
end