selenium-connect 1.3.0 → 1.3.1

data/lib/selenium-connect.rb

@@ -1,5 +1,38 @@
 require 'selenium-webdriver'
-require 'selenium-connect/selenium-connect'
 require 'selenium-connect/configuration'
 require 'selenium-connect/runner'
 require 'selenium-connect/server'
+
+module SeleniumConnect
+  extend self
+
+  def configure
+    yield configuration
+  end
+
+  def configuration
+    @configuration = Configuration.new
+  end
+
+  attr_reader :server, :driver
+
+  def localhost?
+    @configuration.host == 'localhost'
+  end
+
+  def run
+    if localhost?
+      @server = Server.new(@configuration)
+      server.start
+    end
+    @driver = Runner.new(@configuration).driver
+  end
+
+  def finish
+    driver.quit
+    if localhost? then server.stop end
+  end
+
+  alias :start :run
+  alias :stop :finish
+end

data/lib/selenium-connect/configuration.rb

@@ -12,6 +12,7 @@ module SeleniumConnect
       @host     = "localhost" unless host
       @port     = "4444"      unless port
       @browser  = "firefox"   unless browser
+      @log      = false       unless log
     end
   end
 end

data/lib/selenium-connect/rake.task

@@ -2,8 +2,7 @@ require 'selenium/rake/server_task'
 
        Selenium::Rake::ServerTask.new(:server) do |t|
          t.version = :latest
-         
          t.background
-         t.log = '/Users/more/Dropbox/_dev/Arrgyle/selenium-connect/runner.out'
+         t.log = 'false'
          t.port = 4444
        end

data/lib/selenium-connect/runner.rb

@@ -1,36 +1,68 @@
 module SeleniumConnect
   class Runner
-    attr_reader :driver, :configuration
+    class Firefox
+      attr_reader :config, :capabilities
 
-    def initialize(configuration)
-      @configuration = configuration
-      @driver = initialize_driver
+      def initialize(config)
+        @config = config
+        set_profile
+      end
+
+      private
+
+      def get_profile
+        if config.profile_path
+          Selenium::WebDriver::Firefox::Profile.new config.profile_path
+        elsif config.profile_name
+          Selenium::WebDriver::Firefox::Profile.from_name config.profile_name
+        end
+      end
+
+      def set_profile
+        profile = get_profile
+        profile.assume_untrusted_certificate_issuer = false unless profile.nil?
+        @capabilities = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile)
+      end
+
+    end #Firefox
+
+    class InternetExplorer
+    end #InternetExplorer
+  end #Runner
+end #SeleniumConnect
+
+module SeleniumConnect
+  class Runner
+    attr_reader :driver, :config
+
+    def initialize(config)
+      @config = config
+      @driver = init_driver
     end
 
     private
 
     def set_server_url
-      "http://#{configuration.host}:#{configuration.port}/wd/hub"
+      "http://#{config.host}:#{config.port}/wd/hub"
     end
 
-    def get_profile
-      if configuration.profile_path
-        Selenium::WebDriver::Firefox::Profile.new configuration.profile_path
-      elsif configuration.profile_name
-        Selenium::WebDriver::Firefox::Profile.from_name configuration.profile_name
-      end
+    def init_driver
+      Selenium::WebDriver.for(
+        :remote,
+        :url => set_server_url,
+        :desired_capabilities => get_capabilities)
     end
 
-    def set_profile
-      profile = get_profile
-      profile.assume_untrusted_certificate_issuer = false unless profile.nil?
-      Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile)
+    def get_capabilities
+      case config.browser
+        when "firefox"
+          Firefox.new(config).capabilities
+        when "ie"
+          InternetExplorer.new(config).capabilities
+        else
+          puts "No valid browser specified"
+      end
     end
 
-    def initialize_driver
-      Selenium::WebDriver::Remote::Bridge.new(
-        :url => set_server_url,
-        :desired_capabilities => set_profile)
-    end
-  end
-end
+  end #Runner
+end #SeleniumConnect

data/lib/selenium-connect/server.rb

@@ -24,11 +24,16 @@ module SeleniumConnect
       "require 'selenium/rake/server_task'
 
        Selenium::Rake::ServerTask.new(:server) do |t|
-         #{"t.version = :latest" unless configuration.jar}
-         #{if configuration.jar then "t.jar = '#{configuration.jar}'" end}
+         #{
+            if configuration.jar
+              "t.jar = '#{configuration.jar}'"
+            else
+              "t.version = :latest"
+            end
+          }
          t.background
-         t.log = '#{configuration.log ? configuration.log : "false"}'
-         t.port = #{configuration.port ? configuration.port : "4444"}
+         t.log = '#{configuration.log}'
+         t.port = #{configuration.port}
        end"
     end
 

data/selenium-connect.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'selenium-connect'
-  s.version       = '1.3.0'
+  s.version       = '1.3.1'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['Dave Haeffner']
   s.email         = ['dave@arrgyle.com']

data/spec/{basic_spec.rb → acceptance_spec.rb}

@@ -1,8 +1,10 @@
 require 'selenium-connect'
 
-describe SeleniumConnect do
+describe "Acceptance Tests" do
 
-  let(:google) { Google.new(SeleniumConnect.start) }
+  let(:google)  { Google.new(SeleniumConnect.start) }
+  let(:driver)  { SeleniumConnect.start }
+  let(:quit)    { SeleniumConnect.finish }
 
   context "Common" do
     it "logging", :wip => true do
@@ -21,7 +23,7 @@ describe SeleniumConnect do
       SeleniumConnect.configure do end
       google.visit
       google.page_title.should include("Google")
-      SeleniumConnect.finish
+      quit
     end
 
     it "localhost" do
@@ -30,13 +32,13 @@ describe SeleniumConnect do
       end
       google.visit
       google.page_title.should include("Google")
-      SeleniumConnect.finish
+      quit
     end
 
-    it "profile name" do
+    it "profile name", :wip => true do
       pending "requires machine setup to run, and need a public example"
       SeleniumConnect.configure do |c|
-        c.profile_name  = "YourProfileName"
+        c.profile_name  = "nt50_ic_egroup"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-connect
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -74,10 +74,9 @@ files:
 - lib/selenium-connect/configuration.rb
 - lib/selenium-connect/rake.task
 - lib/selenium-connect/runner.rb
-- lib/selenium-connect/selenium-connect.rb
 - lib/selenium-connect/server.rb
 - selenium-connect.gemspec
-- spec/basic_spec.rb
+- spec/acceptance_spec.rb
 homepage: https://github.com/arrgyle/selenium-connect
 licenses:
 - MIT

data/lib/selenium-connect/selenium-connect.rb

@@ -1,33 +0,0 @@
-module SeleniumConnect
-  extend self
-
-  def configure
-    yield configuration
-  end
-
-  def configuration
-    @configuration = Configuration.new
-  end
-
-  attr_reader :server, :driver
-
-  def localhost?
-    @configuration.host == 'localhost'
-  end
-
-  def run
-    if localhost?
-      @server = Server.new(@configuration)
-      server.start
-    end
-    @driver = Runner.new(@configuration).driver
-  end
-
-  def finish
-    driver.quit
-    if localhost? then server.stop end
-  end
-
-  alias :start :run
-  alias :stop :finish
-end