watir_session 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40a20b54cfe09649622bafd024804856695b234
-  data.tar.gz: fcccb9373fefcbc5aa44a4cb8a9dd387ece3daef
+  metadata.gz: b8dbe01ed4a189544d75a9dd9442da5de4230658
+  data.tar.gz: 58006e6f4a52159e702fe9d0231f72c33e19027d
 SHA512:
-  metadata.gz: 3ef12968842c063d13215666b88ff4b5d1463058019b22c13ddf9255e82efb9b99737cd6c3c4f12583261ed046ac733dffeafc9dd6b57d14b6b82b6453bfc877
-  data.tar.gz: a7de7c9fe2a4a7e2fbf0af84a69d84ee78de403b7c7eb6016de458c6b60deb8a284a5a02fba69bc5bcce7bbbf9b0b95b5a8afdd147c18559f2a11a8f6e1ae707
+  metadata.gz: 711eabec5d9b973ded56125c98c010061cc98f6363bd4d85ec5eb41cae7e1cd010717cae92e73b2b25a0030a1e0412c26581535c041c584f6d32831e0081674d
+  data.tar.gz: 9c4a2f18ca0a97d6b5ea4e8a342d94495dabc790424e9eb190b2df87295b925be563af312ec915e448e5bde843f469787cde4c21b99b53006c3e3d2e7593a9fa

data/README.md

@@ -31,8 +31,8 @@ with your 
test harness (RSpec, Cucumber, etc) for maximum flexibility.
 
 ```
ruby
 WatirSession.start

-WatirSession.start_test


-WatirSession.end_test


+WatirSession.before_each


+WatirSession.after_each


 ```
 
 ## Example
@@ -50,9 +50,9 @@ class SauceSession
 end
 ```
 ```ruby
-require 'model'
+require 'watir_model'
 
-class SauceConfig < Model
+class SauceConfig < WatirModel
   key(:sauce_username) { ENV['SAUCE_USERNAME'] }
   key(:sauce_access_key) { ENV['SAUCE_ACCESS_KEY'] }
   key(:endpoint) {"http://#{sauce_username}:#{sauce_access_key}@ondemand.saucelabs.com:80/wd/hub"}
@@ -64,10 +64,10 @@ RSpec.configure do |config|
   WatirSession.register_session(SauceSession.new)
 
   config.before(:each) do
-    @browser = WatirSession.start_test
+    @browser = WatirSession.before_each
   end
   config.after(:each) do
-    WatirSession.end_test
+    WatirSession.after_each
   end
 end
 ```

data/lib/watir_session/custom_config.rb

@@ -1,5 +1,7 @@
-require 'model'
+require 'watir_model'
 
-class CustomConfig < Model
+class CustomConfig < WatirModel
+
+  # Implement this class in your project
 
 end

data/lib/watir_session/watir_config.rb

@@ -1,7 +1,6 @@
-require 'model'
-require 'yaml'
+require 'watir_model'
 
-class WatirConfig < Model
+class WatirConfig < WatirModel
 
   ## --Browser Options-- ##
 
@@ -63,8 +62,4 @@ class WatirConfig < Model
   # Note: This setting will be ignored if platform is not Linux, and will raise error if xvfb is not installed
   key(:headless) { ENV['HEADLESS'] == 'true' }
 
-  ## --Additional Options-- ##
-
-  key(:custom_config)
-
 end

data/lib/watir_session/watir_session.rb

@@ -3,12 +3,37 @@ module WatirSession
   extend self
 
   attr_reader :browser
-  attr_accessor :watir_config
+  attr_writer :watir_config
 
   def watir_config
     @watir_config ||= WatirConfig.new
   end
 
+  def custom_config
+    @custom_config ||= CustomConfig.new
+  end
+
+  def create_configurations
+    spec_path = $LOAD_PATH.select { |path| path =~ /\/spec$/ }.first
+    config_path = spec_path.gsub('spec', 'config')
+
+    return unless Dir.exist?(config_path)
+    Dir.entries(config_path).select { |file| file =~ /\.yml$/ }.each do |yaml|
+      config_name = yaml.gsub('.yml', '')
+      next unless Object.const_defined?("#{config_name.capitalize}Config")
+      load_yml(config_path, config_name)
+    end
+  end
+
+  def load_yml(config_path, config_name)
+    config = YAML.load_file("#{config_path}/#{config_name}.yml")
+    if config.values.all? { |v| v.is_a? Hash } && custom_config.respond_to?(config_name.singularize)
+      config = config[custom_config.send(config_name.singularize)]
+    end
+    obj = Object.const_get("#{config_name.capitalize}Config").new(config)
+    custom_config.send("#{config_name}=", obj)
+  end
+
   def registered_sessions
     @registered_sessions ||= []
   end
@@ -27,77 +52,74 @@ module WatirSession
     end
   end
 
+  def start
+    configure_watir
+    create_configurations
+  end
+
+  def before_suite(*args)
+    create_browser if watir_config.reuse_browser
+
+    execute_hook :before_suite, *args
+  end
+
+  def before_browser(*args)
+    execute_hook :before_browser, *args
+  end
+
   def create_browser(*args)
-    use_headless_display if @watir_config.headless
+    use_headless_display if watir_config.headless
 
     @browser = execute_hook(:create_browser, *args).compact.first
 
     unless @browser
       http_client = Selenium::WebDriver::Remote::Http::Default.new
-      http_client.timeout = @watir_config.http_timeout
-      @browser = Watir::Browser.new(@watir_config.browser,
+      http_client.timeout = watir_config.http_timeout
+      @browser = Watir::Browser.new(watir_config.browser,
                                     http_client: http_client)
     end
     @browser
   end
 
-  def before_tests(config = nil, *args)
-    @watir_config = config || watir_config
-
-    configure_watir
-
-    create_browser if @watir_config.reuse_browser
-
-    execute_hook :before_tests, *args
-    execute_hook :start, *args
-  end
-  alias_method :start, :before_tests
-
-  def start_test(*args)
-    if @watir_config.reuse_browser && browser.nil
+  def before_each(*args)
+    if watir_config.reuse_browser && browser.nil
       raise StandardError, "#before_tests method must be set in order to use
 the #reuse_browser configuration setting"
     end
 
-    before_test(*args)
+    before_browser(*args)
 
-    @browser = create_browser(*args) unless @watir_config.reuse_browser
-    @browser.window.maximize if @watir_config.maximize_browser
+    @browser = create_browser(*args) unless watir_config.reuse_browser
+    @browser.window.maximize if watir_config.maximize_browser
 
-    execute_hook :start_test, *args
+    execute_hook :before_each, *args
 
     @browser
   end
 
-  def end_test(*args)
-    execute_hook :end_test, *args
+  def after_each(*args)
+    execute_hook :after_each, *args
 
     take_screenshot(*args) unless watir_config.take_screenshots == :never
 
     quit_browser unless watir_config.reuse_browser
 
-    after_test(*args)
+    after_browser(*args)
   end
 
-  def after_tests(*args)
-    quit_browser if @watir_config.reuse_browser
-
-    execute_hook :after_tests, *args
-    execute_hook :end, *args
+  def after_browser(*args)
+    execute_hook :after_browser, *args
   end
-  alias_method :end, :after_tests
 
   def take_screenshot(*args)
     screenshot = execute_hook(:take_screenshot, *args).compact
     browser.screenshot.save("screenshot.png") if screenshot.nil?
   end
 
-  def before_test(*args)
-    execute_hook :before_test, *args
-  end
+  def after_suite(*args)
+    quit_browser if watir_config.reuse_browser
 
-  def after_test(*args)
-    execute_hook :after_test, *args
+    execute_hook :after_suite, *args
   end
 
   def quit_browser
@@ -119,6 +141,7 @@ the #reuse_browser configuration setting"
 
   def reset_config!
     @watir_config = nil
+    @custom_config = nil
   end
 
   def reset_registered_sessions!
@@ -126,9 +149,9 @@ the #reuse_browser configuration setting"
   end
 
   def configure_watir
-    Watir.default_timeout = @watir_config.watir_timeout
-    Watir.prefer_css = @watir_config.prefer_css
-    Watir.always_locate = @watir_config.always_locate
+    Watir.default_timeout = watir_config.watir_timeout
+    Watir.prefer_css = watir_config.prefer_css
+    Watir.always_locate = watir_config.always_locate
   end
 
   def use_headless_display

data/watir_session.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'watir_session'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 
@@ -29,6 +29,6 @@ to configurarion and session data so they do not need to be passed around as par
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'headless' # This only gets required when on Linux
   spec.add_development_dependency 'watir-webdriver'
-  spec.add_development_dependency 'test-model'
+  spec.add_development_dependency 'watir_model'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-model
+  name: watir_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="