Skip to content

Commit

Permalink
[ajey] upgraded mysql version, and removed static factory attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
ajeygore committed Aug 24, 2018
1 parent ba2c361 commit 619cb49
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'figaro'
gem 'font-awesome-rails'
gem 'jbuilder'
gem 'jquery-rails'
gem 'mysql2', '~> 0.3.18', platform: :ruby
gem 'mysql2', '~> 0.4.10'
gem 'newrelic_rpm'
gem 'omniauth'
gem 'omniauth-google-oauth2'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.3.21)
mysql2 (0.4.10)
newrelic_rpm (5.3.0.346)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
Expand Down Expand Up @@ -346,7 +346,7 @@ DEPENDENCIES
jbuilder
jquery-rails
mock_redis
mysql2 (~> 0.3.18)
mysql2 (~> 0.4.10)
newrelic_rpm
omniauth
omniauth-google-oauth2
Expand Down Expand Up @@ -376,4 +376,4 @@ DEPENDENCIES
whenever

BUNDLED WITH
1.16.2
1.16.4
2 changes: 1 addition & 1 deletion spec/factories/access_tokens.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FactoryBot.define do
factory :access_token do
token SecureRandom.uuid
token { SecureRandom.uuid }
end
end
4 changes: 2 additions & 2 deletions spec/factories/api_resources.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FactoryBot.define do
factory :api_resource do
sequence(:name, 1000) { |n| "API#{n}" }
description "MyString"
access_key "MyString"
description { "MyString" }
access_key { "MyString" }
end
end
4 changes: 2 additions & 2 deletions spec/factories/group_associations.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :group_association do
user ""
group ""
user { "" }
group { "" }
end
end
4 changes: 2 additions & 2 deletions spec/factories/host_access_groups.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :host_access_group do
references ""
references ""
references { "" }
references { "" }
end
end
4 changes: 2 additions & 2 deletions spec/factories/host_machine_groups.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :host_machine_group do
user nil
host_machine nil
user { nil }
host_machine { nil }
end
end
4 changes: 2 additions & 2 deletions spec/factories/ip_addresses.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :ip_address do
address "MyString"
mac_address "MyString"
address { "MyString" }
mac_address { "MyString" }
end
end
16 changes: 8 additions & 8 deletions spec/factories/organisations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
country = Country.find_country_by_name(Country.all.map(&:name).sort.sample)
factory :organisation do
sequence(:slug) { |n| "#{Faker::Internet.slug}_#{n}" }
name Faker::Lorem.word
website Faker::Internet.url
domain Faker::Internet.email.split('@').last
country country.gec
state Faker::Address.state
address Faker::Lorem.words(3).join(' ')
unit_name 'IT'
admin_email_address Faker::Internet.email
name { Faker::Lorem.word }
website { Faker::Internet.url }
domain { Faker::Internet.email.split('@').last }
country { country.gec }
state { Faker::Address.state }
address { Faker::Lorem.words(3).join(' ') }
unit_name { 'IT' }
admin_email_address { Faker::Internet.email }
end
end
4 changes: 2 additions & 2 deletions spec/factories/user_host_access_groups.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :user_host_access_group do
user nil
host_access_group nil
user { nil }
host_access_group { nil }
end
end
12 changes: 6 additions & 6 deletions spec/factories/users.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
factory :user do
name
email
active true
admin true
active { true }
admin { true }
sequence(:reset_password_token) { |n| "secret#{n}" }
after(:create) do |user, _evaluator|
user.assign_attributes(
Expand All @@ -23,8 +23,8 @@
factory :group_admin, class: User do
name
email
active true
admin true
active { true }
admin { true }
sequence(:reset_password_token) { |n| "secret#{n}" }
after(:create) do |user, _evaluator|
user.assign_attributes(
Expand All @@ -38,8 +38,8 @@
factory :admin_user, class: User do
name
email
active true
admin true
active { true }
admin { true }
sequence(:reset_password_token) { |n| "secret#{n}" }
after(:create) do |user, _evaluator|
user.assign_attributes(
Expand Down

0 comments on commit 619cb49

Please sign in to comment.