Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"

This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing
changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.

2 files changed, 2 insertions, 88 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 89f78f629d4..4cdcae5f670 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1925,7 +1925,7 @@ describe Ci::Build do
 
     context 'when token is empty' do
       before do
-        build.update_columns(token: nil, token_encrypted: nil)
+        build.token = nil
       end
 
       it { is_expected.to be_nil}
@@ -2141,7 +2141,7 @@ describe Ci::Build do
       end
 
       before do
-        build.set_token('my-token')
+        build.token = 'my-token'
         build.yaml_variables = []
       end
 
diff --git a/spec/models/concerns/token_authenticatable_spec.rb b/spec/models/concerns/token_authenticatable_spec.rb
index 55d83bc3a6b..0cdf430e9ab 100644
--- a/spec/models/concerns/token_authenticatable_spec.rb
+++ b/spec/models/concerns/token_authenticatable_spec.rb
@@ -351,89 +351,3 @@ describe PersonalAccessToken, 'TokenAuthenticatable' do
     end
   end
 end
-
-describe Ci::Build, 'TokenAuthenticatable' do
-  let(:token_field) { :token }
-  let(:build) { FactoryBot.build(:ci_build) }
-
-  it_behaves_like 'TokenAuthenticatable'
-
-  describe 'generating new token' do
-    context 'token is not generated yet' do
-      describe 'token field accessor' do
-        it 'makes it possible to access token' do
-          expect(build.token).to be_nil
-
-          build.save!
-
-          expect(build.token).to be_present
-        end
-      end
-
-      describe "ensure_token" do
-        subject { build.ensure_token }
-
-        it { is_expected.to be_a String }
-        it { is_expected.not_to be_blank }
-
-        it 'does not persist token' do
-          expect(build).not_to be_persisted
-        end
-      end
-
-      describe 'ensure_token!' do
-        it 'persists a new token' do
-          expect(build.ensure_token!).to eq build.reload.token
-          expect(build).to be_persisted
-        end
-
-        it 'persists new token as an encrypted string' do
-          build.ensure_token!
-
-          encrypted = Gitlab::CryptoHelper.aes256_gcm_encrypt(build.token)
-
-          expect(build.read_attribute('token_encrypted')).to eq encrypted
-        end
-
-        it 'does not persist a token in a clear text' do
-          build.ensure_token!
-
-          expect(build.read_attribute('token')).to be_nil
-        end
-      end
-    end
-
-    describe '#reset_token!' do
-      it 'persists a new token' do
-        build.save!
-
-        build.token.yield_self do |previous_token|
-          build.reset_token!
-
-          expect(build.token).not_to eq previous_token
-          expect(build.token).to be_a String
-        end
-      end
-    end
-  end
-
-  describe 'setting a new token' do
-    subject { build.set_token('0123456789') }
-
-    it 'returns the token' do
-      expect(subject).to eq '0123456789'
-    end
-
-    it 'writes a new encrypted token' do
-      expect(build.read_attribute('token_encrypted')).to be_nil
-      expect(subject).to eq '0123456789'
-      expect(build.read_attribute('token_encrypted')).to be_present
-    end
-
-    it 'does not write a new cleartext token' do
-      expect(build.read_attribute('token')).to be_nil
-      expect(subject).to eq '0123456789'
-      expect(build.read_attribute('token')).to be_nil
-    end
-  end
-end