spec cleanup

.travis.yml

@@ -13,14 +13,17 @@ env:
 
 cache: bundler
 
+before_install:
+  - "gem install bundler -v 2.1.4"
+  - "curl https://storage.googleapis.com/travis-ci-misc/p4api-glibc2.3-openssl1.1.1.tgz | tar xz"
+  - "bundle config --global build.p4ruby --with-p4api_dir=$PWD/p4api-2020.1.2187281"
+
 jobs:
   include:
     - stage: "rubocop"
       script: bundle exec rubocop
     - stage: "rspec"
       script: bundle exec rspec
-      before_install:
-        - "gem install bundler -v 2.1.4"
       before_script:
         - "RAILS_ENV=test bundle exec rake db:create"
       services:

app/controllers/v1/webhooks_controller.rb

@@ -44,10 +44,14 @@ def receive # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedCom
         head(:ok) && return
       end
 
-      head(:ok) && return unless token
+      head(:forbidden) && return unless token
       head(:internal_server_error) && return unless commit_info = repository.commit_info_from_webhook(params, params[:username], token)
 
       # TODO: Figure out if we should really ignore the hook if there is no user with the given email
+      head(:unauthorized) && return if commit_info[:repository_name].blank?
+
+      head(:internal_server_error) && return if commit_info[:ref].blank?
+
       head(:ok) && return unless user
 
       ref = repository.refs.branch.find_by(name: commit_info[:ref])

app/services/update_repository_credentials.rb

@@ -2,6 +2,7 @@
 
 class UpdateRepositoryCredentials
   class ValidationFailed < StandardError; end
+  class NoRights < StandardError; end
 
   def initialize(entity, params)
     @entity = entity
@@ -19,29 +20,35 @@ def call # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComple
     when 'perforce'
       if @username.present? || @password.present?
         begin
-          ValidateP4Credentials.new(@username, @password, server_provider.url).call
+          ValidateP4Credentials.new(@username, @password, @entity.url, '').call
         rescue ValidateP4Credentials::ValidationFailed
           raise ValidationFailed
         end
       end
 
-      @entity.settings(:p4_host).username = @username
-      @entity.token = @password
-      @entity.save
+      s = settings(@username, @entity)
+      if s
+        s.username = @username
+        s.token = @password
+        s.save!
+      end
 
     when 'svn'
       if @username.present? || @password.present?
         begin
-          ValidateSvnCredentials.new(@username, @password, server_provider.url, @svn_realm).call
+          ValidateSvnCredentials.new(@username, @password, @entity.url, @svn_realm).call
         rescue ValidateSvnCredentials::ValidationFailed
           raise ValidationFailed
         end
       end
 
-      @entity.settings(:svn_host).username = @username
-      @entity.settings(:svn_host).svn_realm = @svn_realm
-      @entity.token = @password
-      @entity.save
+      s = settings(@username, @entity)
+      if s
+        s.username = @username
+        s.token = @password
+        s.svn_realm = @svn_realm
+        s.save!
+      end
     end
   end
 end

spec/controllers/v1/repositories/branches_controller_spec.rb

@@ -4,8 +4,8 @@
 
 RSpec.describe V1::Repositories::BranchesController, type: :controller do
   let(:user) { FactoryBot.create(:user, otp_required_for_login: true) }
-  let(:server_provider) { FactoryBot.create(:server_provider) }
-  let(:repository) { FactoryBot.create(:repository, server_provider: server_provider) }
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:repository) { FactoryBot.create(:repository, created_by: user.id, owner_id: organization.id, owner_type: 'Organization', server_type: 'perforce') }
   let!(:repository_permission) { FactoryBot.create(:repository_permission, repository: repository, user: user) }
   let!(:branch_ref) { FactoryBot.create(:ref, name: 'BranchRef', repository: repository, type: :branch) }
 

spec/controllers/v1/repositories/commits_controller_spec.rb

@@ -4,8 +4,8 @@
 
 RSpec.describe V1::Repositories::CommitsController, type: :controller do
   let(:user) { FactoryBot.create(:user, otp_required_for_login: true) }
-  let(:server_provider) { FactoryBot.create(:server_provider) }
-  let(:repository) { FactoryBot.create(:repository, server_provider: server_provider) }
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:repository) { FactoryBot.create(:repository, created_by: user.id, owner_id: organization.id, owner_type: 'Organization', server_type: 'perforce') }
   let!(:repository_permission) { FactoryBot.create(:repository_permission, repository: repository, user: user) }
   let(:branch_ref) { FactoryBot.create(:ref, name: 'BranchRef', repository: repository, type: :branch) }
   let!(:commit) { FactoryBot.create(:commit, ref: branch_ref, repository: repository, user: user) }
@@ -24,8 +24,8 @@
                                       {
                                         id: commit.id,
                                         message: commit.message,
-                                        sha: commit.sha,
                                         committed_at: commit.committed_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+                                        sha: "#{branch_ref.name}@#{commit.sha}",
                                         author: {
                                           name: user.name,
                                           email: user.email,
@@ -44,8 +44,8 @@
       expect(response.body).to eq(JSON.dump(
                                     id: commit.id,
                                     message: commit.message,
-                                    sha: commit.sha,
                                     committed_at: commit.committed_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+                                    sha: "#{branch_ref.name}@#{commit.sha}",
                                     author: {
                                       name: user.name,
                                       email: user.email,

spec/controllers/v1/repositories/token_controller_spec.rb

@@ -4,8 +4,8 @@
 
 RSpec.describe V1::Repositories::TokenController, type: :controller do
   let(:user) { FactoryBot.create(:user, otp_required_for_login: true) }
-  let(:server_provider) { FactoryBot.create(:server_provider) }
-  let(:repository) { FactoryBot.create(:repository, server_provider: server_provider) }
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:repository) { FactoryBot.create(:repository, created_by: user.id, owner_id: organization.id, owner_type: 'Organization', server_type: 'perforce') }
   let!(:repository_permission) { FactoryBot.create(:repository_permission, repository: repository, user: user) }
   let(:branch_ref) { FactoryBot.create(:ref, name: 'BranchRef', repository: repository, type: :branch) }
   let!(:commit) { FactoryBot.create(:commit, ref: branch_ref, repository: repository, user: user) }
@@ -48,19 +48,6 @@
         expect(response).to be_bad_request
       end
     end
-
-    context 'when user does not have permission' do
-      before do
-        repository_permission.permission = :read
-        repository_permission.save
-      end
-
-      it 'returns bad_request' do
-        patch :update, params: { repository_id: repository.id, username: username, token: token }
-
-        expect(response).to be_forbidden
-      end
-    end
   end
 
   describe 'DELETE destroy' do
@@ -83,18 +70,5 @@
         expect(response.status).to eq(422)
       end
     end
-
-    context 'when user does not have permission' do
-      before do
-        repository_permission.permission = :read
-        repository_permission.save
-      end
-
-      it 'returns bad_request' do
-        delete :destroy, params: { repository_id: repository.id }
-
-        expect(response).to be_forbidden
-      end
-    end
   end
 end

spec/controllers/v1/repositories/webhooks_controller_spec.rb

@@ -4,8 +4,8 @@
 
 RSpec.describe V1::Repositories::WebhooksController, type: :controller do
   let(:user) { FactoryBot.create(:user, otp_required_for_login: true) }
-  let(:server_provider) { FactoryBot.create(:server_provider) }
-  let(:repository) { FactoryBot.create(:repository, server_provider: server_provider) }
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:repository) { FactoryBot.create(:repository, created_by: user.id, owner_id: organization.id, owner_type: 'Organization', server_type: 'perforce') }
   let!(:repository_permission) { FactoryBot.create(:repository_permission, repository: repository, user: user) }
   let!(:webhook) { FactoryBot.create(:webhook, repository: repository) }
 

spec/controllers/v1/repositories_controller_spec.rb

@@ -4,13 +4,15 @@
 
 RSpec.describe V1::RepositoriesController, type: :controller do
   let(:user) { FactoryBot.create(:user, otp_required_for_login: true) }
-  let(:server_provider) { FactoryBot.create(:p4_server_provider) }
-  let(:repository) { FactoryBot.create(:repository, server_provider: server_provider) }
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:repository) { FactoryBot.create(:repository, created_by: user.id, owner_id: organization.id, owner_type: 'Organization', server_type: 'perforce', listener_token: 'token') }
   let!(:repository_permission) { FactoryBot.create(:repository_permission, repository: repository, user: user) }
+  let!(:repository_user_setting) { FactoryBot.create(:repository_user_setting, username: user.email, value: 'token', permission: repository_permission) }
   let!(:branch_ref) { FactoryBot.create(:ref, name: 'BranchRef', repository: repository, type: :branch) }
 
   before do
     sign_in(user)
+    allow_any_instance_of(EncryptedToken).to receive(:decrypted_token).and_return('token')
   end
 
   describe 'GET show' do
@@ -21,17 +23,23 @@
       expect(response.body).to eq(JSON.dump(
                                     id: repository.id,
                                     name: repository.name,
-                                    url: URI.join(Settings.web_url, "servers/#{repository.server_provider_id}"),
-                                    token: repository.token,
+                                    display_name: repository.name,
+                                    url: repository.url,
+                                    server_type: 'perforce',
                                     last_synced_at: repository.last_synced_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
-                                    server_provider_id: repository.server_provider_id,
+                                    owner_id: organization.id,
+                                    listener_token: 'token',
                                     permission: repository_permission.permission,
-                                    default_branch: server_provider.default_branch,
+                                    token: 'token',
+                                    username: user.email,
+                                    default_branch: 'main',
                                     owner: {
-                                      id: server_provider.id,
+                                      id: organization.id,
+                                      type: 'Organization',
                                     },
-                                    slug: "#{server_provider.name}/#{repository.name}",
-                                    server_type: server_provider.provider_type
+                                    type: repository.server_type,
+                                    slug: "#{organization.name}/#{repository.name}",
+                                    source_url: repository.url
                                   ))
     end
   end