popup 0.0.7 → 0.0.8

data/lib/popup.rb

@@ -5,4 +5,5 @@ require 'popup/file_ext'
 require 'popup/file_popup'
 require 'popup/alert_popup'
 require 'popup/confirm_popup'
-require 'popup/save_popup'
+require 'popup/save_popup'
+require 'popup/version'

data/lib/popup/popup.rb

@@ -27,10 +27,12 @@ module ATT
     @@windows = nil
     RAutomation::Window.wait_timeout = Config::timeout
     ENV["RAUTOMATION_ADAPTER"] = "autoit"
+    
     def initialize(window) # :nodoc: 
       @window = window
     end
     
+    attr_reader :window
 # Get a popup between record() and find(),
 # * If not found, it will raise +WindowNotFoundError
 # * Else, if found more than one windows, it will raise MutliWindowsMatchError

data/lib/popup/version.rb

@@ -1,5 +1,5 @@
 module ATT
   class Popup
-    VERSION='0.0.7'
+    VERSION='0.0.8'
   end
 end

data/spec/alert_popup_spec.rb

@@ -19,15 +19,4 @@ describe ATT::AlertPopup do
     alert = @b.button(:id,"alert_popup")
     ATT::AlertPopup.find_when { alert.click_no_wait }.click
   end
-  
-  it "#find_when in one block" do
-    alert = @b.button(:id,"alert_popup")
-    b2 = TestBrowser.get2
-    alert2 = b2.button(:id,"alert_popup")
-    ATT::AlertPopup.find_when {
-      ATT::AlertPopup.find_when { alert2.click_no_wait }.click
-      alert.click_no_wait
-    }.click
-  end
-  
 end

data/spec/popup_spec.rb

@@ -22,13 +22,15 @@ describe ATT::Popup do
     o.should_not be_nil
     o.close
   end
-  it "#find multi" do
+  it "#find multi and test window" do
     b = TestBrowser.get
     ATT::Popup.record
     b.file_field(:id,"file_popup").click_no_wait
     c = Watir::IE.new
     o = ATT::Popup.find
     o.should_not be_nil
+    # read window obj for more
+    o.window.should_not be_nil
     o.close
     c.close
   end

data/spec/save_popup_spec.rb

@@ -1,23 +1,23 @@
-require 'spec_helper'
-
-describe ATT::SavePopup do
-  before(:each) do
-    #@b = TestBrowser.get
-  end
-  
-  it "#exist?" do
-    window = RAutomation::Window.new(:title=>"notexist")
-    o = ATT::SavePopup.new(window)
-    o.should respond_to("exist?")
-    o.should respond_to("assert_exist?")
-  end
-  
-  it "#set #saveas" do
-    window = RAutomation::Window.new(:title=>"notexist")
-    o = ATT::SavePopup.new(window)
-    o.should respond_to("set")
-    o.should respond_to("saveas")
-    
-  end
-   #saveas
-end
+require 'spec_helper'
+
+describe ATT::SavePopup do
+  before(:each) do
+    #@b = TestBrowser.get
+  end
+  
+  it "#exist?" do
+    window = RAutomation::Window.new(:title=>"notexist")
+    o = ATT::SavePopup.new(window)
+    o.should respond_to("exist?")
+    o.should respond_to("assert_exist?")
+  end
+  
+  it "#set #saveas" do
+    window = RAutomation::Window.new(:title=>"notexist")
+    o = ATT::SavePopup.new(window)
+    o.should respond_to("set")
+    o.should respond_to("saveas")
+    
+  end
+   #saveas
+end

data/spec/spec_helper.rb

@@ -16,17 +16,6 @@ class TestBrowser
     at_exit { close rescue nil }
     @browser
   end
-  
-  def self.get2(type= :ie)
-    @server || start_server
-    if @browser2.nil?
-      @browser2 = Watir::Browser.new()
-      @browser2.goto("http://localhost:#{@port}/file.html")
-    end
-    at_exit { @browser2.close rescue nil }
-    @browser2
-  end
-  
   def self.start_server
     @server = PopupServer.new
     @port = @server.port

metadata

@@ -1,57 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: popup
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - yafei Li
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-08 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rautomation
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22677144 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22677144
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &22676736 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *22676736
 description: popup operation for all windows version.
 email: lyfi2003@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/popup/alert_popup.rb
 - lib/popup/confirm_popup.rb
 - lib/popup/constants/file_popup.yml
@@ -73,45 +60,33 @@ files:
 - spec/save_popup_spec.rb
 - spec/spec_helper.rb
 - spec/webserver.rb
-- spec/websserver.rb
 - support/file_popup/test.txt
 - support/file_popup/test1.txt
 - support/html_popup/file.html
 - Rakefile
 - README.md
-has_rdoc: true
 homepage: https://github.com/windy/popup
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: popup operation for all windows version.
 test_files: []
-

data/spec/websserver.rb

@@ -1,56 +0,0 @@
-require 'webrick'
-require 'timeout'
-require 'webrick/https'
-class PopupServer
-  
-  attr_reader :port,:run
-  def initialize(port=12346)
-    @run = false
-    @port = port
-    @s = WEBrick::HTTPServer.new(
-    :Port=> @port,
-    :DocumentRoot => File.join(File.join(__FILE__,'..','..','support'),"html_popup"),
-    :SSLEnable=> true,
-    :SSLVerifyClient =>OpenSSL::SSL::VERIFY_NONE,
-    :SSLCertName => [ ["CN", "Hello" ] ]
-    )
-    trap("INT") { @s.shutdown }
-    @s.mount("/html_popup",WEBrick::HTTPServlet::FileHandler,"/file.html")
-  end
-
-  def start(wait_forever = false)
-    raise "popup server is running,can NOT run again" if @run
-    @run = true
-    @s_thread = Thread.new do
-      @s.start
-    end
-    wait
-    @s_thread.join if wait_forever
-  end
-  
-  def wait(timeout=10)
-    Timeout.timeout(timeout,"after #{timeout} popup server still can NOT start") do
-      loop do
-        begin
-          TCPSocket.new("127.0.0.1",@port)
-          return true
-        rescue
-          sleep 0.5
-        end
-      end
-    end
-  end
-  
-  def stop
-    @s.shutdown
-    @run = false
-  end
-
-end
-
-if $0 == __FILE__
-  a = PopupServer.new
-  a.start(true)
-  #sleep 100
-  #a.stop
-end