diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-08 17:22:13 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-08 17:22:13 +0300 |
commit | 1fefc2831eed7f88ecead78cc6fbc9836e94fa64 (patch) | |
tree | dd9331af1faa8754dbadb71760d388efff4a8fed /spec | |
parent | 354471bd7c1a1d00e1105bbd938756fd26709ca2 (diff) | |
parent | 7dba769886e662d4a5701285421f6e75b917d1eb (diff) |
Merge remote-tracking branch 'origin/master' into 8-10-stable
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/admin/admin_abuse_reports_spec.rb | 30 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 21 |
2 files changed, 51 insertions, 0 deletions
diff --git a/spec/features/admin/admin_abuse_reports_spec.rb b/spec/features/admin/admin_abuse_reports_spec.rb new file mode 100644 index 00000000000..16baf7e9516 --- /dev/null +++ b/spec/features/admin/admin_abuse_reports_spec.rb @@ -0,0 +1,30 @@ +require 'spec_helper' + +describe "Admin::AbuseReports", feature: true, js: true do + let(:user) { create(:user) } + + context 'as an admin' do + describe 'if a user has been reported for abuse' do + before do + create(:abuse_report, user: user) + login_as :admin + end + + describe 'in the abuse report view' do + it "should present a link to the user's profile" do + visit admin_abuse_reports_path + + expect(page).to have_link user.name, href: user_path(user) + end + end + + describe 'in the profile page of the user' do + it 'should show a link to the admin view of the user' do + visit user_path(user) + + expect(page).to have_link '', href: admin_user_path(user) + end + end + end + end +end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 328254ed56b..3984b30ddf8 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -446,6 +446,7 @@ describe User, models: true do it { expect(user.can_create_group?).to be_truthy } it { expect(user.can_create_project?).to be_truthy } it { expect(user.first_name).to eq('John') } + it { expect(user.external).to be_falsey } end describe 'with defaults' do @@ -468,6 +469,26 @@ describe User, models: true do expect(user.theme_id).to eq(1) end end + + context 'when current_application_settings.user_default_external is true' do + before do + stub_application_setting(user_default_external: true) + end + + it "creates external user by default" do + user = build(:user) + + expect(user.external).to be_truthy + end + + describe 'with default overrides' do + it "creates a non-external user" do + user = build(:user, external: false) + + expect(user.external).to be_falsey + end + end + end end describe '.find_by_any_email' do |