rspectacular 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/rspectacular/plugins/factory_girl.rb +8 -1
  2. data/lib/rspectacular/spec_helpers/active_record_spec_helper.rb +2 -6
  3. data/lib/rspectacular/version.rb +1 -1
  4. metadata +2 -2
data/lib/rspectacular/plugins/factory_girl.rb CHANGED
@@ -1,5 +1,12 @@
1
- if defined? FactoryGirl
1
+ begin
2
+ require 'factory_girl'
3
+
4
+ if FactoryGirl.configuration.factories.count.zero?
5
+ FactoryGirl.find_definitions
6
+ end
7
+
2
8
  RSpec.configure do |config|
3
9
  config.include FactoryGirl::Syntax::Methods
4
10
  end
11
+ rescue LoadError
5
12
  end
data/lib/rspectacular/spec_helpers/active_record_spec_helper.rb CHANGED
@@ -1,10 +1,5 @@
1
1
  require 'active_record'
2
2
 
3
- begin
4
- require 'factory_girl'
5
- rescue LoadError
6
- end
7
-
8
3
  rails_database_yaml_file_path = File.expand_path('../../config/database.yml', __FILE__)
9
4
  rails_engine_database_yaml_file_path = File.expand_path('../../dummy/config/database.yml', __FILE__)
10
5
 
@@ -18,7 +13,8 @@ connection_info = YAML.load_file(database_yaml_file_path)[
18
13
 
19
14
  ActiveRecord::Base.establish_connection(connection_info)
20
15
 
21
- Dir[File.expand_path('../factories/**/*.rb', __FILE__)].each { |f| require f }
16
+ require 'rspectacular'
17
+
22
18
  Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
23
19
 
24
20
  RSpec.configure do |config|
data/lib/rspectacular/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RSpectacular
2
- VERSION = '0.3.0'
2
+ VERSION = '0.4.0'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rspectacular
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.4.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
95
95
  version: '0'
96
96
  requirements: []
97
97
  rubyforge_project: rspectacular
98
- rubygems_version: 1.8.23
98
+ rubygems_version: 1.8.24
99
99
  signing_key:
100
100
  specification_version: 3
101
101
  summary: RSpec Support And Matchers