Add latest changes from gitlab-org/gitlab@master

4 files changed, 92 insertions, 14 deletions

diff --git a/spec/support/database/multiple_databases.rb b/spec/support/database/multiple_databases.rb
index b863767b5df..b6341c2caec 100644
--- a/spec/support/database/multiple_databases.rb
+++ b/spec/support/database/multiple_databases.rb
@@ -2,15 +2,6 @@
 
 module Database
   module MultipleDatabases
-    def run_and_cleanup(example)
-      # Each example may call `migrate!`, so we must ensure we are migrated down every time
-      schema_migrate_down!
-
-      example.run
-
-      delete_from_all_tables!(except: deletion_except_tables)
-    end
-
     def skip_if_multiple_databases_not_setup
       skip 'Skipping because multiple databases not set up' unless Gitlab::Database.has_config?(:ci)
     end
@@ -40,10 +31,15 @@ module Database
             config_model: base_model
           )
 
-          schema_migrate_up!
           delete_from_all_tables!(except: deletion_except_tables)
+          schema_migrate_up!
         end
       end
+
+      # ActiveRecord::Base.clear_all_connections! disconnects and clears attribute methods
+      # Force a refresh to avoid schema failures.
+      reset_column_in_all_models
+      refresh_attribute_methods
     end
 
     # The usage of this method switches temporarily used `connection_handler`
@@ -152,10 +148,10 @@ RSpec.configure do |config|
           config_model: base_model
         )
 
-        run_and_cleanup(example)
+        example.run
       end
     else
-      run_and_cleanup(example)
+      example.run
     end
 
     self.class.use_transactional_tests = true
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 7bd1f0c5dfa..222cbe9feeb 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -22,4 +22,14 @@ RSpec.configure do |config|
 
     self.class.use_transactional_tests = true
   end
+
+  config.around(:each, :migration) do |example|
+    self.class.use_transactional_tests = false
+
+    example.run
+
+    delete_from_all_tables!(except: deletion_except_tables)
+
+    self.class.use_transactional_tests = true
+  end
 end
diff --git a/spec/support/migration.rb b/spec/support/migration.rb
index 24e2fc2ff31..490aa836d74 100644
--- a/spec/support/migration.rb
+++ b/spec/support/migration.rb
@@ -19,6 +19,8 @@ RSpec.configure do |config|
   # Each example may call `migrate!`, so we must ensure we are migrated down every time
   config.before(:each, :migration) do
     use_fake_application_settings
+
+    schema_migrate_down!
   end
 
   config.after(:context, :migration) do
diff --git a/spec/support/shared_examples/requests/access_tokens_controller_shared_examples.rb b/spec/support/shared_examples/requests/access_tokens_controller_shared_examples.rb
index 59e641e2af6..c83abdea0eb 100644
--- a/spec/support/shared_examples/requests/access_tokens_controller_shared_examples.rb
+++ b/spec/support/shared_examples/requests/access_tokens_controller_shared_examples.rb
@@ -4,7 +4,7 @@ RSpec.shared_examples 'GET resource access tokens available' do
   let_it_be(:active_resource_access_token) { create(:personal_access_token, user: bot_user) }
 
   it 'retrieves active resource access tokens' do
-    subject
+    get_access_tokens
 
     token_entities = assigns(:active_resource_access_tokens)
     expect(token_entities.length).to eq(1)
@@ -12,10 +12,80 @@ RSpec.shared_examples 'GET resource access tokens available' do
   end
 
   it 'lists all available scopes' do
-    subject
+    get_access_tokens
 
     expect(assigns(:scopes)).to eq(Gitlab::Auth.resource_bot_scopes)
   end
+
+  it 'returns for json response' do
+    get_access_tokens_json
+
+    expect(json_response.count).to eq(1)
+  end
+
+  context "when access_tokens are paginated" do
+    before do
+      allow(Kaminari.config).to receive(:default_per_page).and_return(1)
+      create(:personal_access_token, user: bot_user)
+    end
+
+    it "returns paginated response", :aggregate_failures do
+      get_access_tokens_with_page
+      expect(assigns(:active_resource_access_tokens).count).to eq(1)
+
+      expect_header('X-Per-Page', '1')
+      expect_header('X-Page', '1')
+      expect_header('X-Next-Page', '2')
+      expect_header('X-Total', '2')
+    end
+  end
+
+  context "when access_token_pagination feature flag is disabled" do
+    before do
+      stub_feature_flags(access_token_pagination: false)
+      create(:personal_access_token, user: bot_user)
+    end
+
+    it "returns all tokens in system" do
+      get_access_tokens_with_page
+      expect(assigns(:active_resource_access_tokens).count).to eq(2)
+    end
+  end
+
+  context "as tokens returned are ordered" do
+    let(:expires_1_day_from_now) { 1.day.from_now.to_date }
+    let(:expires_2_day_from_now) { 2.days.from_now.to_date }
+
+    before do
+      create(:personal_access_token, user: bot_user, name: "Token1", expires_at: expires_1_day_from_now)
+      create(:personal_access_token, user: bot_user, name: "Token2", expires_at: expires_2_day_from_now)
+    end
+
+    it "orders token list ascending on expires_at" do
+      get_access_tokens
+
+      first_token = assigns(:active_resource_access_tokens).first.as_json
+      expect(first_token['name']).to eq("Token1")
+      expect(first_token['expires_at']).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+    end
+
+    it "orders tokens on id in case token has same expires_at" do
+      create(:personal_access_token, user: bot_user, name: "Token3", expires_at: expires_1_day_from_now)
+      get_access_tokens
+
+      first_token = assigns(:active_resource_access_tokens).first.as_json
+      expect(first_token['name']).to eq("Token3")
+      expect(first_token['expires_at']).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+
+      second_token = assigns(:active_resource_access_tokens).second.as_json
+      expect(second_token['name']).to eq("Token1")
+      expect(second_token['expires_at']).to eq(expires_1_day_from_now.strftime("%Y-%m-%d"))
+    end
+  end
+
+  def expect_header(header_name, header_val)
+    expect(response.headers[header_name]).to eq(header_val)
+  end
 end
 
 RSpec.shared_examples 'POST resource access tokens available' do