summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/gitlab_ci_service_spec.rb1
-rw-r--r--spec/models/issue_spec.rb2
-rw-r--r--spec/models/key_spec.rb2
-rw-r--r--spec/models/merge_request_spec.rb2
-rw-r--r--spec/models/milestone_spec.rb1
-rw-r--r--spec/models/namespace_spec.rb2
-rw-r--r--spec/models/note_spec.rb2
-rw-r--r--spec/models/project_snippet_spec.rb1
-rw-r--r--spec/models/project_spec.rb2
-rw-r--r--spec/models/protected_branch_spec.rb1
-rw-r--r--spec/models/service_spec.rb1
-rw-r--r--spec/models/snippet_spec.rb1
-rw-r--r--spec/models/user_spec.rb60
-rw-r--r--spec/models/users_group_spec.rb1
-rw-r--r--spec/models/users_project_spec.rb1
-rw-r--r--spec/models/web_hook_spec.rb1
16 files changed, 11 insertions, 70 deletions
diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb
index a0708f14236..439a30869bb 100644
--- a/spec/models/gitlab_ci_service_spec.rb
+++ b/spec/models/gitlab_ci_service_spec.rb
@@ -26,7 +26,6 @@ describe GitlabCiService do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe 'commits methods' do
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index d53c4037c35..8b299cea67c 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -25,8 +25,6 @@ describe Issue do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:author_id) }
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe 'modules' do
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 474067fe38a..95c0aed0ffe 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -20,8 +20,6 @@ describe Key do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
- it { should_not allow_mass_assignment_of(:user_id) }
end
describe "Validation" do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1148df87ab7..ec6d29de82b 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -28,8 +28,6 @@ describe MergeRequest do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:author_id) }
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Respond to" do
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 8309ad3a724..a3071c3251a 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -22,7 +22,6 @@ describe Milestone do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Validation" do
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index d2bf96979f9..3562ebed1ff 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -26,8 +26,6 @@ describe Namespace do
it { should validate_presence_of :owner }
describe "Mass assignment" do
- it { should allow_mass_assignment_of(:name) }
- it { should allow_mass_assignment_of(:path) }
end
describe "Respond to" do
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 43779e6bbfc..d06dee6ce92 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -27,8 +27,6 @@ describe Note do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:author) }
- it { should_not allow_mass_assignment_of(:author_id) }
end
describe "Validation" do
diff --git a/spec/models/project_snippet_spec.rb b/spec/models/project_snippet_spec.rb
index 42147179387..e4df934460b 100644
--- a/spec/models/project_snippet_spec.rb
+++ b/spec/models/project_snippet_spec.rb
@@ -23,7 +23,6 @@ describe ProjectSnippet do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Validation" do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 93eae5a9ebd..c3263ed0fe7 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -48,8 +48,6 @@ describe Project do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:namespace_id) }
- it { should_not allow_mass_assignment_of(:creator_id) }
end
describe "Validation" do
diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb
index 35b929c2f3e..af48c2c6d9e 100644
--- a/spec/models/protected_branch_spec.rb
+++ b/spec/models/protected_branch_spec.rb
@@ -17,7 +17,6 @@ describe ProtectedBranch do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe 'Validation' do
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index a4bed81c0f6..adeeac115c1 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -27,7 +27,6 @@ describe Service do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Test Button" do
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index a77c594aaf1..d179e9516e2 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -24,7 +24,6 @@ describe Snippet do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:author_id) }
end
describe "Validation" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0a665b7defb..a36b57a95de 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -65,8 +65,6 @@ describe User do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:projects_limit) }
- it { should allow_mass_assignment_of(:projects_limit).as(:admin) }
end
describe 'validations' do
@@ -243,59 +241,23 @@ describe User do
it { user.first_name.should == 'John' }
end
- describe 'without defaults' do
+ describe 'with defaults' do
let(:user) { User.new }
- it "should not apply defaults to user" do
- user.projects_limit.should == 10
- user.can_create_group.should be_true
- user.theme_id.should == Gitlab::Theme::BASIC
- end
- end
- context 'as admin' do
- describe 'with defaults' do
- let(:user) { User.build_user({}, as: :admin) }
-
- it "should apply defaults to user" do
- user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
- user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
- user.theme_id.should == Gitlab.config.gitlab.default_theme
- end
- end
-
- describe 'with default overrides' do
- let(:user) { User.build_user({projects_limit: 123, can_create_group: true, can_create_team: true, theme_id: Gitlab::Theme::BASIC}, as: :admin) }
-
- it "should apply defaults to user" do
- Gitlab.config.gitlab.default_projects_limit.should_not == 123
- Gitlab.config.gitlab.default_can_create_group.should_not be_true
- Gitlab.config.gitlab.default_theme.should_not == Gitlab::Theme::BASIC
- user.projects_limit.should == 123
- user.can_create_group.should be_true
- user.theme_id.should == Gitlab::Theme::BASIC
- end
+ it "should apply defaults to user" do
+ user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
+ user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
+ user.theme_id.should == Gitlab.config.gitlab.default_theme
end
end
- context 'as user' do
- describe 'with defaults' do
- let(:user) { User.build_user }
+ describe 'with default overrides' do
+ let(:user) { User.new(projects_limit: 123, can_create_group: false, can_create_team: true, theme_id: Gitlab::Theme::BASIC) }
- it "should apply defaults to user" do
- user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
- user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
- user.theme_id.should == Gitlab.config.gitlab.default_theme
- end
- end
-
- describe 'with default overrides' do
- let(:user) { User.build_user(projects_limit: 123, can_create_group: true, theme_id: Gitlab::Theme::BASIC) }
-
- it "should apply defaults to user" do
- user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
- user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
- user.theme_id.should == Gitlab.config.gitlab.default_theme
- end
+ it "should apply defaults to user" do
+ user.projects_limit.should == 123
+ user.can_create_group.should be_false
+ user.theme_id.should == Gitlab::Theme::BASIC
end
end
end
diff --git a/spec/models/users_group_spec.rb b/spec/models/users_group_spec.rb
index 05dd97d92d4..0b6f7a08198 100644
--- a/spec/models/users_group_spec.rb
+++ b/spec/models/users_group_spec.rb
@@ -20,7 +20,6 @@ describe UsersGroup do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:group_id) }
end
describe "Validation" do
diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb
index aa4b8cb449b..3f38164e964 100644
--- a/spec/models/users_project_spec.rb
+++ b/spec/models/users_project_spec.rb
@@ -20,7 +20,6 @@ describe UsersProject do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Validation" do
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 20ee1416125..e9c04ee89cb 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -23,7 +23,6 @@ describe ProjectHook do
end
describe "Mass assignment" do
- it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Validations" do
View Lorry Controller Status