Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make find case insensitive #277

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ env:
script:
- docker-compose run web rails db:test:prepare
- docker-compose run web rspec

test:
testLogging:
- events "passed", "skipped", "failed"
- exceptionFormat "full"
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ group :test do
gem 'capybara', '>= 2.15'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
gem 'database_cleaner'
gem 'database_cleaner-active_record'
gem 'factory_bot_rails'
gem 'poltergeist'
gem 'selenium-webdriver'
Expand Down
15 changes: 9 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
airbrake (8.1.4)
airbrake-ruby (~> 3.2)
airbrake-ruby (3.2.6)
airbrake (10.0.0)
airbrake-ruby (~> 4.12)
airbrake-ruby (4.13.0)
rbtree3 (~> 0.5)
and_feathers (0.0.1)
and_feathers-gzipped_tarball (1.0.0.pre)
Expand Down Expand Up @@ -112,7 +112,10 @@ GEM
crass (1.0.4)
css_parser (1.7.0)
addressable
database_cleaner (1.7.0)
database_cleaner (1.8.0.beta)
database_cleaner-active_record (1.8.0.beta)
activerecord
database_cleaner (~> 1.8.0.beta)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.3)
Expand Down Expand Up @@ -288,7 +291,7 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rbtree3 (0.5.0)
rbtree3 (0.6.0)
redcarpet (3.4.0)
redis (4.1.0)
regexp_parser (1.3.0)
Expand Down Expand Up @@ -441,7 +444,7 @@ DEPENDENCIES
chromedriver-helper
coffee-rails (~> 4.2)
commonmarker
database_cleaner
database_cleaner-active_record
dotenv-rails
email_reply_parser
escape_utils
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/concerns/annotations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def common_annotations(extension, version, asset=nil)
version.release_assets.map{|a| a.labels}.flatten.reject(&:blank?).uniq.sort.join(', ')
end
tags ||= nil
owner_name = extension.hosted? ? ENV['HOST_ORGANIZATION'] : extension.owner_name
owner_name = extension.hosted? ? ENV['HOST_ORGANIZATION'] : extension.owner_name.downcase

annotations = {
'io.sensu.bonsai.url' => owner_scoped_extension_url(extension),
Expand Down
6 changes: 3 additions & 3 deletions app/models/extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class Extension < ApplicationRecord
}

scope :in_namespace, lambda { |namespace|
where(owner_name: namespace)
where(Extension.arel_table[:owner_name].matches(namespace))
}

scope :supported_platforms, lambda { |sp_ids|
Expand Down Expand Up @@ -161,13 +161,13 @@ class Extension < ApplicationRecord
class << self

def with_owner_and_lowercase_name(owner_name:, lowercase_name:)
Extension.find_by!(owner_name: owner_name, lowercase_name: lowercase_name)
Extension.where(Extension.arel_table[:owner_name].matches(owner_name)).where(lowercase_name: lowercase_name).first!
end

def filter_private(current_user)
if current_user.present?
user_names = current_user.accounts.for(:github).map(&:username)
where("COALESCE(extensions.privacy, false) = false OR extensions.owner_name = ?", user_names)
where("COALESCE(extensions.privacy, false) = false OR extensions.owner_name ILIKE ?", user_names)
else
where("COALESCE(extensions.privacy, false) = false")
end
Expand Down
4 changes: 3 additions & 1 deletion app/workers/extension_notify_worker.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class ExtensionNotifyWorker
class ExtensionNotifyWorker < ApplicationWorker

#
# Notify all followers that a new version of the specified +Extension+ has been updated.
# This will only email the follower if the user has email notifications turned on.
Expand Down Expand Up @@ -31,4 +32,5 @@ def perform(extension_version_id)
ExtensionMailer.follower_notification_email(extension_version, extension_follower.user).deliver
end
end

end
7 changes: 7 additions & 0 deletions spec/models/extension_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@

end

describe "with_owner_and_lowercase_name" do
let(:extension) { create(:extension, owner_name: 'MiXeDcAsE')}
it 'returns_extension_case_insensitive' do
expect(Extension.with_owner_and_lowercase_name(owner_name: 'mixedcase', lowercase_name: extension.lowercase_name)).to eq(extension)
end
end

describe "sorted_extension_versions" do
let(:extension) { create(:extension, extension_versions_count: 6) }
let(:versions ) { extension.extension_versions }
Expand Down
14 changes: 6 additions & 8 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
require 'spec_helper'
require 'database_cleaner'
require 'database_cleaner/active_record'

RSpec.configure do |config|

config.before(:suite) do
DatabaseCleaner.strategy = :transaction
DatabaseCleaner.clean_with(:truncation)
end

config.before(:each) do
DatabaseCleaner.strategy = :transaction
DatabaseCleaner.start
end

config.append_after(:each) do
DatabaseCleaner.clean
config.around(:each) do |test|
DatabaseCleaner.cleaning do
test.run
end
end

end