Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-01-22 21:10:56 +0300
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-02-06 16:35:35 +0300
commitbc78ae6985ee37f9ac2ffc2dbf6f445078d16038 (patch)
tree1b53d4292becd29f1fe37a4fbb3e1562b3b80c40 /spec/lib/gitlab/checks
parent32b2ff26011a5274bdb8a3dd41ad360a67c3148a (diff)
Add specs
Diffstat (limited to 'spec/lib/gitlab/checks')
-rw-r--r--spec/lib/gitlab/checks/new_project_spec.rb46
-rw-r--r--spec/lib/gitlab/checks/project_moved_spec.rb18
2 files changed, 55 insertions, 9 deletions
diff --git a/spec/lib/gitlab/checks/new_project_spec.rb b/spec/lib/gitlab/checks/new_project_spec.rb
new file mode 100644
index 00000000000..c696e02e41a
--- /dev/null
+++ b/spec/lib/gitlab/checks/new_project_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe Gitlab::Checks::NewProject, :clean_gitlab_redis_shared_state do
+ let(:user) { create(:user) }
+ let(:project) { create(:project) }
+
+ describe '.fetch_new_project_message' do
+ context 'with a new project message queue' do
+ let(:new_project) { described_class.new(user, project, 'http') }
+
+ before do
+ new_project.add_new_project_message
+ end
+
+ it 'returns new project message' do
+ expect(described_class.fetch_new_project_message(user.id, project.id)).to eq(new_project.new_project_message)
+ end
+
+ it 'deletes the new project message from redis' do
+ expect(Gitlab::Redis::SharedState.with { |redis| redis.get("new_project:#{user.id}:#{project.id}") }).not_to be_nil
+ described_class.fetch_new_project_message(user.id, project.id)
+ expect(Gitlab::Redis::SharedState.with { |redis| redis.get("new_project:#{user.id}:#{project.id}") }).to be_nil
+ end
+ end
+
+ context 'with no new project message queue' do
+ it 'returns nil' do
+ expect(described_class.fetch_new_project_message(1, 2)).to be_nil
+ end
+ end
+ end
+
+ describe '#add_new_project_message' do
+ it 'queues a new project message' do
+ new_project = described_class.new(user, project, 'http')
+
+ expect(new_project.add_new_project_message).to eq('OK')
+ end
+
+ it 'handles anonymous push' do
+ new_project = described_class.new(user, nil, 'http')
+
+ expect(new_project.add_new_project_message).to be_nil
+ end
+ end
+end
diff --git a/spec/lib/gitlab/checks/project_moved_spec.rb b/spec/lib/gitlab/checks/project_moved_spec.rb
index f90c2d6aded..b03a598edd8 100644
--- a/spec/lib/gitlab/checks/project_moved_spec.rb
+++ b/spec/lib/gitlab/checks/project_moved_spec.rb
@@ -6,14 +6,14 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
describe '.fetch_redirct_message' do
context 'with a redirect message queue' do
- it 'should return the redirect message' do
+ it 'returns the redirect message' do
project_moved = described_class.new(project, user, 'foo/bar', 'http')
project_moved.add_redirect_message
expect(described_class.fetch_redirect_message(user.id, project.id)).to eq(project_moved.redirect_message)
end
- it 'should delete the redirect message from redis' do
+ it 'deletes the redirect message from redis' do
project_moved = described_class.new(project, user, 'foo/bar', 'http')
project_moved.add_redirect_message
@@ -24,19 +24,19 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
end
context 'with no redirect message queue' do
- it 'should return nil' do
+ it 'returns nil' do
expect(described_class.fetch_redirect_message(1, 2)).to be_nil
end
end
end
describe '#add_redirect_message' do
- it 'should queue a redirect message' do
+ it 'queues a redirect message' do
project_moved = described_class.new(project, user, 'foo/bar', 'http')
expect(project_moved.add_redirect_message).to eq("OK")
end
- it 'should handle anonymous clones' do
+ it 'handles anonymous clones' do
project_moved = described_class.new(project, nil, 'foo/bar', 'http')
expect(project_moved.add_redirect_message).to eq(nil)
@@ -45,7 +45,7 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
describe '#redirect_message' do
context 'when the push is rejected' do
- it 'should return a redirect message telling the user to try again' do
+ it 'returns a redirect message telling the user to try again' do
project_moved = described_class.new(project, user, 'foo/bar', 'http')
message = "Project 'foo/bar' was moved to '#{project.full_path}'." +
"\n\nPlease update your Git remote:" +
@@ -56,7 +56,7 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
end
context 'when the push is not rejected' do
- it 'should return a redirect message' do
+ it 'returns a redirect message' do
project_moved = described_class.new(project, user, 'foo/bar', 'http')
message = "Project 'foo/bar' was moved to '#{project.full_path}'." +
"\n\nPlease update your Git remote:" +
@@ -69,7 +69,7 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
describe '#permanent_redirect?' do
context 'with a permanent RedirectRoute' do
- it 'should return true' do
+ it 'returns true' do
project.route.create_redirect('foo/bar', permanent: true)
project_moved = described_class.new(project, user, 'foo/bar', 'http')
expect(project_moved.permanent_redirect?).to be_truthy
@@ -77,7 +77,7 @@ describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do
end
context 'without a permanent RedirectRoute' do
- it 'should return false' do
+ it 'returns false' do
project.route.create_redirect('foo/bar')
project_moved = described_class.new(project, user, 'foo/bar', 'http')
expect(project_moved.permanent_redirect?).to be_falsy