osaka 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854d5b4239636f0440e333079786058eb04104d5
-  data.tar.gz: 05d82bb53d115828c0545585288c1d5c155097ff
+  metadata.gz: 3c3111ee1c6b444321590382e2bca76f4341c674
+  data.tar.gz: ab4b79b6eb693de745f8b0d13014301217aba48e
 SHA512:
-  metadata.gz: 98ac0bf615f682f2fe15913e42c4785bff36a0635e46745a43fc4c4d6329f1e5d3529ed7539727a4e8c69f2f31ef888f5f109926ea9b9ddf26e3f5e167b948ce
-  data.tar.gz: abb76f7009b18c85e62847f563a3aa6384e4ebfa742d24396dbeee73de36c7fd6cb140adca7d7c90e0622a059d354e28949361e7e8382067ad25f9bbd62b6188
+  metadata.gz: 6925989beb9445a8356c78d08adef696fdf63a98e9f6193e8803b48cf5ca6993328e876812a3d0f77f8b1c96a0995a6868e56a6f2382dadde21fffcfdb10e35c
+  data.tar.gz: 14554cb5bc06dbff9e95779a0f1651ce176582f0bbdc3c76b0765db757349239506311f09cc46835ef73a2b55155e71140ae9a7d643ac327127c70f2d3c40a4e

data/lib/osaka/mailmergeflow.rb

@@ -1,12 +1,12 @@
 
 module CommonFlows
-  
+
   def self.number_and_pages_mail_merge(numbers_file, pages_file, output_file)
-    
+
     if block_given?
       Osaka::Numbers.create_document(numbers_file) { |numbers|
-        yield numbers         
-      }      
+        yield numbers
+      }
     end
 
     pages = Osaka::Pages.new

data/lib/osaka/numbers.rb

@@ -1,6 +1,6 @@
 
 module Osaka
-  
+
   class Location
     def cell(name)
       create_location_with_added_name("cell", name)
@@ -10,44 +10,44 @@ module Osaka
       create_location_with_added_name("table", name)
     end
   end
-  
+
   class Numbers < TypicalApplication
-  
+
     def initialize
       super "Numbers"
     end
-  
+
     def new_document
       super
-      control.set_current_window(do_and_wait_for_new_window {
+      control.set_current_window(do_and_wait_for_new_standard_window {
         control.keystroke(:return)
       })
     end
-    
+
     def self.create_document(filename, &block)
       numbers = Osaka::Numbers.new
       numbers.create_document(filename, &block)
     end
-    
+
     def fill_cell(column, row, value)
       if (column > column_count)
         set_column_count(column)
       end
       control.tell("tell document 1; tell sheet 1; tell table 1; set value of cell #{column} of row #{row} to \"#{value}\"; end tell; end tell; end tell")
     end
-    
+
     def column_count
       control.tell("tell document 1; tell sheet 1; tell table 1; get column count; end tell; end tell; end tell").to_i
     end
-    
+
     def set_column_count(amount)
       control.tell("tell document 1; tell sheet 1; tell table 1; set column count to #{amount}; end tell; end tell; end tell")
-    end    
-    
+    end
+
     def set_header_columns(column)
       control.click_menu_bar(at.menu_item(column.to_s).menu(1).menu_item("Header Columns"), "Table")
     end
-    
-    
+
+
   end
 end

data/lib/osaka/pages.rb

@@ -89,8 +89,8 @@ module Osaka
 
     def new_document
       super
-      if control.current_window_name == "Template Chooser"
-        control.set_current_window(do_and_wait_for_new_window {
+      if control.window_list.include? "Template Chooser"
+        control.set_current_window(do_and_wait_for_new_standard_window {
           control.click(at.button("Choose").window("Template Chooser"))
         })
       end

data/lib/osaka/remotecontrol.rb

@@ -11,6 +11,16 @@ module Osaka
     attr_reader :name
     attr_accessor :base_location
 
+    @@debug_info_enabled = false
+
+    def self.enable_debug_prints
+      @@debug_info_enabled = true
+    end
+
+    def debug_print(message)
+      puts message if @@debug_info_enabled
+    end
+
     def initialize(name, base_location = Location.new(""))
       @name = name
       @base_location = base_location
@@ -89,6 +99,7 @@ module Osaka
 
     def wait_until_exists!(*locations, &action)
       wait_until(locations, action) { |location|
+        debug_print "Waiting until exists: #{location.to_s} on remote #{current_window_name.to_s}"
         exists?(location)
       }
     end
@@ -219,6 +230,7 @@ module Osaka
     end
 
     def set_current_window(window_name)
+      debug_print "Changing remote base location to: #{window_name}"
       @base_location = at.window(window_name)
     end
 

data/lib/osaka/scriptrunner.rb

@@ -1,16 +1,16 @@
 # encoding: utf-8
 
 module Osaka
-  
+
   class ScriptRunnerError < RuntimeError
   end
-  
+
   class TimeoutError < RuntimeError
   end
 
   class VersioningError < RuntimeError
   end
-  
+
   module ScriptRunner
 
     @@debug_info_enabled = false
@@ -40,36 +40,36 @@ module Osaka
           File.open(@@debug_info_script_filename, File::WRONLY|File::APPEND|File::CREAT, 0755) { |file|
             file.puts("osascript#{escaped_commands}")
           }
-        end        
+        end
         puts debug_output
       end
     end
-    
+
     def self.print_debug_info_for_additional_output(output)
       if (!output.empty? && debug_prints?)
         if (@@debug_info_format == :plain_text)
           debug_output = "Output was: #{output}"
         elsif (@@debug_info_format == :short_html)
           debug_output = "Output: <b>#{output}</b><br>"
-        end        
+        end
         puts debug_output
       end
     end
-  
+
     def self.execute(applescript)
       script_commands = applescript.gsub("\"", "\\\"").split(';')
-      escaped_commands = "" 
-      script_commands.each { |l| 
+      escaped_commands = ""
+      script_commands.each { |l|
         escaped_commands += " -e \"#{l.strip}\""
       }
 
       print_debug_info_for_escaped_commands(applescript, escaped_commands)
-      
+
       output = ""
       begin
         output = CommandRunner::run("osascript#{escaped_commands}")
       rescue Osaka::SystemCommandFailed => ex
-        if ex.message =~ /assistive devices/ 
+        if ex.message =~ /assistive devices/
           puts <<-eom
             Osaka execution failed with the error: #{ex.message}
             The reason for this is probably that you didn't enable the acess for assistive devices.
@@ -78,7 +78,7 @@ module Osaka
                system preferences -> Accessibility -> Enable access for assistive devices
             If you are under snow leopard, it is under:
                system preferences -> Universal Access -> Enable access for assistive devices
-               
+
             Osaka will not continue as it won't work without this enabled. Please enable it and re-run.
           eom
           exit
@@ -88,8 +88,8 @@ module Osaka
       end
       print_debug_info_for_additional_output(output)
       output
-    end  
-  
+    end
+
     def self.execute_file(scriptName, parameters = "")
       CommandRunner::run("osascript #{scriptName} #{parameters}".strip)
     end

data/lib/osaka/typicalapplication.rb

@@ -1,40 +1,40 @@
 # encoding: utf-8
 module Osaka
-  
+
   class ApplicationInfo
 
     attr_reader :name
 
     def initialize(script_info)
       @name = script_info.match(/name:(.+?), creation date/)[1]
-    end    
+    end
   end
 
   class ApplicationWindowsMustBeClosed < StandardError
   end
 
   class TypicalApplication
-  
+
     attr_accessor :control
-  
+
     def initialize(name)
       @name = name
       @control = RemoteControl.new(name)
     end
-    
+
     def initialize_copy(other)
       super
       @control = other.control.clone
     end
-    
+
     def get_info
       script_info = control.tell("get info for (path to application \"#{@name}\")")
       ApplicationInfo.new(script_info)
     end
-  
+
     def open (filename)
       abolutePathFileName = File.absolute_path(filename)
-      new_window = do_and_wait_for_new_window {
+      new_window = do_and_wait_for_new_standard_window {
         control.tell("open \"#{abolutePathFileName}\"")
       }
       control.set_current_window(new_window)
@@ -55,13 +55,13 @@ module Osaka
         end
       end
     end
-    
+
     def close_dialog_sheet_with_dont_save
       if (control.exists?(at.sheet(1)))
         control.click!(at.button("Don’t Save").sheet(1))
       end
     end
-    
+
     def quit(option = :user_chose)
       if control.running?
         control.quit
@@ -78,55 +78,65 @@ module Osaka
       end
       (latest_window_list - original_window_list)[0]
     end
-    
+
+    def do_and_wait_for_new_standard_window
+      control.activate
+      latest_window_list = original_window_list = control.standard_window_list
+      yield
+      while ((latest_window_list - original_window_list).size == 0)
+        latest_window_list = control.standard_window_list
+      end
+      (latest_window_list - original_window_list)[0]
+    end
+
     def new_document
-      control.set_current_window(do_and_wait_for_new_window {
+      control.set_current_window(do_and_wait_for_new_standard_window {
         control.keystroke("n", :command)
       })
       control.focus
     end
-    
+
     def create_document(filename)
       new_document
       yield self
       save_as(filename)
       close
     end
-    
+
     def duplicate_available?
       control.exists?(at.menu_item("Duplicate").menu(1).menu_bar_item("File").menu_bar(1))
     end
-    
+
     def duplicate
       unless duplicate_available?
         raise(Osaka::VersioningError, "MacOS Versioning Error: Duplicate is not available on this Mac version")
       end
-      do_and_wait_for_new_window {
+      do_and_wait_for_new_standard_window {
         control.click_menu_bar(at.menu_item("Duplicate"), "File")
       }
       new_instance = clone
-      new_instance.control.set_current_window(do_and_wait_for_new_window {
+      new_instance.control.set_current_window(do_and_wait_for_new_standard_window {
         sleep(0.4) # This sleep is added because mountain lion keynote crashes without it!
         control.keystroke!(:return)
       }) unless control.mac_version == :lion
-      
+
       new_instance
     end
-    
+
     def duplicate_and_close_original
-      new_instance = duplicate        
-      close  
+      new_instance = duplicate
+      close
       @control = new_instance.control
     end
-    
+
     def save
       control.keystroke("s", :command)
     end
-    
+
     def save_pops_up_dialog?
       control.exists?(at.menu_item("Save…").menu(1).menu_bar_item("File").menu_bar(1))
     end
-    
+
     def save_as(filename)
       if save_pops_up_dialog?
         save
@@ -138,37 +148,37 @@ module Osaka
           control.keystroke("s", [:command, :shift])
         end
       end
-      
-      wait_for_save_dialog_and_save_file(filename)      
+
+      wait_for_save_dialog_and_save_file(filename)
     end
-    
+
     def wait_for_save_dialog_and_save_file(filename)
       control.wait_until_exists(at.sheet(1))
       dialog = create_dialog(TypicalSaveDialog, at.sheet(1))
       dialog.save(filename)
       control.set_current_window(File.basename(filename))
     end
-    
+
     def close(option = :user_chose)
       control.keystroke("w", :command)
       wait_for_window_and_dialogs_to_close(option)
     end
-  
+
     def activate
       if (control.mac_version == :lion)
-        control.launch unless control.running? 
+        control.launch unless control.running?
       end
       control.activate
     end
-    
+
     def focus
       control.focus
     end
-    
+
     def running?
       control.running?
     end
-  
+
     def copy
       control.keystroke("c", :command)
     end
@@ -184,22 +194,22 @@ module Osaka
     def select_all
       control.keystroke("a", :command)
     end
-    
+
     def print_dialog
       control.keystroke("p", :command).wait_until_exists(at.sheet(1))
       create_dialog(TypicalPrintDialog, at.sheet(1))
     end
-    
+
     def create_dialog(dialog_class, location)
       dialog_class.new(control.name, location + (location.has_top_level_element? ? "" : control.base_location))
     end
-    
+
     def select_file_from_open_dialog(filename, dialog_location)
       dialog = create_dialog(TypicalOpenDialog, dialog_location)
       dialog.set_folder(File.dirname(filename))
       dialog.select_file(File.basename(filename))
     end
-    
+
     def raise_error_on_open_standard_windows(error_message)
       raise Osaka::ApplicationWindowsMustBeClosed, error_message if ! control.standard_window_list.empty?
     end

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

data/spec/integration_numbers_spec.rb

@@ -2,16 +2,16 @@ require 'tmpdir'
 require 'osaka'
 
 describe "Integration tests for Numbers" do
-  
+
   it "Should be able to fill in large index cells", :integration => true do
-    
+
     Dir.mktmpdir { |dir|
-      
+
       Osaka::Numbers.create_document(File.join(dir, "temp.numbers")) { |doc|
         doc.fill_cell(12, 1, "Data")
       }
     }
-    
+
   end
-  
+
 end

data/spec/integration_pages_spec.rb

@@ -0,0 +1,24 @@
+
+require 'tmpdir'
+require 'osaka'
+
+describe "Integration of mail merge flow with Pages and Numbers", :integration => true do
+
+
+  before (:each) do
+    @tempdir = Dir.mktmpdir
+    @pages_template_filename = File.join(@tempdir, "document.pages")
+    @pdf_output_file = File.join(@tempdir, "output.pdf")
+  end
+
+  after (:each) do
+    FileUtils.remove_entry_secure @tempdir
+  end
+
+  it "Should be able to open a new document" do
+
+    Osaka::Pages.create_document(@pages_template_filename) { |doc|
+      doc.type("Hello World! This is pages. We're going to mail merge!\r\r")
+    }
+  end
+end

data/spec/launchservices_spec.rb

@@ -56,8 +56,8 @@ END_OF_DUMP
   end
 
   it "Can retrieve a value based on the bundle name" do
-    Osaka::CommandRunner.should_receive(:run).and_return(@dumped_registry)
-    Osaka::LaunchServices.retrieve("TextMate")[:id].should== "54064"
+    expect(Osaka::CommandRunner).to receive(:run).and_return(@dumped_registry)
+    expect(Osaka::LaunchServices.retrieve("TextMate")[:id]).to eq "54064"
   end
 end
 

data/spec/numbers_spec.rb

@@ -5,53 +5,53 @@ describe "Osaka::Numbers" do
 
   include(*Osaka::OsakaExpectations)
 
-  subject { Osaka::Numbers.new }  
+  subject { Osaka::Numbers.new }
   let(:control) { subject.control = double("RemoteControl").as_null_object}
-  
+
   it "Should be able to get the column count" do
     expect_tell('tell document 1; tell sheet 1; tell table 1; get column count; end tell; end tell; end tell').and_return("10")
     expect(subject.column_count).to eq 10
   end
-  
+
   it "Should be able to set the column count to a certain value" do
     expect_tell('tell document 1; tell sheet 1; tell table 1; set column count to 10; end tell; end tell; end tell')
     subject.set_column_count(10)
   end
-  
-  it "Should be able to fill in data in cells" do 
+
+  it "Should be able to fill in data in cells" do
     expect(subject).to receive(:column_count).and_return(10)
     expect_tell('tell document 1; tell sheet 1; tell table 1; set value of cell 1 of row 2 to "30"; end tell; end tell; end tell')
     subject.fill_cell(1, 2, "30")
   end
-  
+
   it "Will change the column count when the cell is outside of the range of the current column count" do
     expect(subject).to receive(:column_count).and_return(5)
     expect(subject).to receive(:set_column_count).with(6)
     expect_tell('tell document 1; tell sheet 1; tell table 1; set value of cell 6 of row 2 to "30"; end tell; end tell; end tell')
     subject.fill_cell(6, 2, "30")
-    
+
   end
-  
+
   it "Should be able to select blank from the template choser" do
     expect_set_current_window("Template Choser")
-    expect(subject).to receive(:do_and_wait_for_new_window).and_return("Template Choser")
+    expect(subject).to receive(:do_and_wait_for_new_standard_window).and_return("Template Choser")
     expect_set_current_window("Untitled")
-    expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("Untitled")
+    expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("Untitled")
     expect_keystroke(:return)
-    subject.new_document 
+    subject.new_document
   end
-  
+
   it "Should be able to change the header columns" do
     expect_click_menu_bar(at.menu_item("0").menu(1).menu_item("Header Columns"), "Table")
     subject.set_header_columns(0)
   end
-  
+
   it "Should be able to use a class method for creating documents quickly" do
       expect(Osaka::Numbers).to receive(:new).at_least(1).times.and_return(double("App"))
       expect(subject).to receive(:create_document)
 
       Osaka::Numbers.create_document("filename") { |doc|
-      }    
+      }
   end
-    
+
 end

data/spec/osakaexpectations_spec.rb

@@ -7,7 +7,7 @@ describe "Osakas Ruby expectations" do
 
   subject { double("RemoteControl") }
   let(:control) { subject }
-  
+
   it "Wait until exists can be called without a code block" do
     expect_wait_until_exists!(at.window(1))
     subject.wait_until_exists!(at.window(1))
@@ -16,7 +16,7 @@ describe "Osakas Ruby expectations" do
   it "Wait until exists can be called with a code block" do
     code_block_been_called = false
     expect_wait_until_exists!(at.window(1)).and_yield
-    
+
     subject.wait_until_exists!(at.window(1)) {
       code_block_been_called = true
     }

data/spec/pages_spec.rb

@@ -17,23 +17,23 @@ describe "Osaka::Pages" do
     end
 
     it "Should be able to create a new document using template choser if there is one" do
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("Template Chooser")    
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("Template Chooser")
       expect_keystroke("n", :command)
       expect_set_current_window("Template Chooser")
-      expect_focus      
-      expect_current_window_name.and_return("Template Chooser")   
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("New Document")
+      expect_focus
+      expect_window_list.and_return(["Template Chooser"])
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("New Document")
       expect_click(at.button("Choose").window("Template Chooser"))
       expect_set_current_window("New Document")
       subject.new_document
     end
 
     it "Should be able to create a new document also when there is no template chooser" do
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("New Document")    
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("New Document")
       expect_keystroke("n", :command)
       expect_set_current_window("New Document")
       expect_focus
-      expect_current_window_name.and_return("New Document")
+      expect_window_list.and_return(["New Document"])
       subject.new_document
     end
 
@@ -48,15 +48,15 @@ describe "Osaka::Pages" do
   end
 
   it "Should be able to do mail merge to a PDF flow" do
-    
+
     mail_merge_dialog = double("Pages Mail Merge Dialog")
     print_dialog = double("Generic Print Dialog")
-    
+
     expect(subject).to receive(:mail_merge).and_return(mail_merge_dialog)
     expect(mail_merge_dialog).to receive(:merge).and_return(print_dialog)
     expect(mail_merge_dialog).to receive(:set_merge_to_printer)
     expect(print_dialog).to receive(:save_as_pdf).with("filename")
-    
+
     subject.mail_merge_to_pdf("filename")
   end
 
@@ -79,9 +79,9 @@ describe "Osaka::Pages" do
     expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("Link")
     expect_exists?(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1)).and_return(true)
     expect_click_menu_bar(at.menu_item("Show Inspector"), "View")
-    
+
     inspector_mock = double("Inspector")
-    expect(Osaka::PagesInspector).to receive(:new).with(control.name, at.window("Link")).and_return(inspector_mock)    
+    expect(Osaka::PagesInspector).to receive(:new).with(control.name, at.window("Link")).and_return(inspector_mock)
     expect(subject.inspector).to eq(inspector_mock)
   end
 
@@ -98,11 +98,11 @@ describe "Osaka::Pages" do
     inspector_mock = double("Inspector")
     expect(subject).to receive(:inspector).and_return(inspector_mock)
     expect(inspector_mock).to receive(:change_mail_merge_source)
-    
+
     expect_wait_until_exists(at.sheet(1))
     expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("dialog")
     expect_click(at.radio_button("Numbers Document:").radio_group(1).sheet(1))
-    
+
     expect(subject).to receive(:select_file_from_open_dialog).with("/tmp/filename", at.window("dialog"))
     expect_click(at.button("OK").sheet(1))
 
@@ -111,11 +111,11 @@ describe "Osaka::Pages" do
   end
 
   it "Should be able to stop when an error happens due to mail merge. This is especially important since otherwise Pages goes nuts and crashes :)" do
-    expect(subject).to receive(:inspector).and_return(double("Inspector").as_null_object)    
+    expect(subject).to receive(:inspector).and_return(double("Inspector").as_null_object)
     expect_wait_until_exists(at.sheet(1))
     expect(subject).to receive(:do_and_wait_for_new_window)
     expect(subject).to receive(:select_file_from_open_dialog)
-    
+
     expect_exists?(at.sheet(1).sheet(1)).and_return(true)
 
     expect {subject.set_mail_merge_document("/tmp/filename") }.to raise_error(Osaka::PagesError, "Setting Mail Merge numbers file failed")
@@ -134,7 +134,7 @@ describe "Osaka::Pages Inspector" do
 
   subject {Osaka::PagesInspector.new("Pages", "Link")}
   let(:control) {subject.control = double("RemoteControl")}
-  
+
   it "Can convert symbolic names to locations" do
     # Nice... checking a map. Perhaps delete ?
     expect(subject.get_location_from_symbol(:document)).to eq at.radio_button(1).radio_group(1)
@@ -173,7 +173,7 @@ describe "Osaka::Pages Mail Merge dialog" do
 
   subject { Osaka::PagesMailMergeDialog.new("", nil) }
   let(:control) {subject.control = double("RemoteControl").as_null_object}
-  
+
   it "Should be able to set the mail merge dialog to merge to new document" do
     expect_click(at.pop_up_button(2).sheet(1))
     expect_wait_until_exists!(at.menu_item(1).menu(1).pop_up_button(2).sheet(1))

data/spec/typicalapplication_spec.rb

@@ -27,6 +27,16 @@ describe "Osaka::TypicalApplication" do
     expect(code_block_called).to eq true
   end
 
+  it "Should be able to do something and wait until a new STANDARD window pops up" do
+    expect_standard_window_list.and_return(["original window"], ["original window"], ["original window"], ["new window", "original window"])
+    expect_activate
+    code_block_called = false
+    expect(subject.do_and_wait_for_new_standard_window {
+      code_block_called = true
+    }).to eq "new window"
+    expect(code_block_called).to eq true
+  end
+
   context "Cloning and copying" do
 
     it "Should be able to clone TypicalApplications" do
@@ -48,20 +58,20 @@ describe "Osaka::TypicalApplication" do
     it "Should pass the right open string to the application osascript" do
       filename = "filename.key"
       expect_tell("open \"#{File.absolute_path(filename)}\"")
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return(filename)
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return(filename)
       expect_set_current_window(filename)
       subject.open(filename)
     end
 
     it "Should only get the basename of the filename when it sets the window title." do
       filename = "/root/dirname/filename.key"
-      expect(subject).to receive(:do_and_wait_for_new_window).and_return("filename")
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_return("filename")
       expect_set_current_window("filename")
       subject.open(filename)
     end
 
     it "Should be able to create a new document" do
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("new_window")
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("new_window")
       expect_keystroke("n", :command)
       expect_set_current_window("new_window")
       expect_focus
@@ -198,7 +208,7 @@ describe "Osaka::TypicalApplication" do
       expect(subject).to receive(:duplicate_available?).and_return(true)
 
       expect_click_menu_bar(at.menu_item("Duplicate"), "File")
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("duplicate window")
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("duplicate window")
 
       allow(subject).to receive_message_chain(:clone, :control).and_return(new_instance_control)
       expect(subject.duplicate.control).to eq(new_instance_control)
@@ -208,7 +218,7 @@ describe "Osaka::TypicalApplication" do
       expect(subject).to receive(:duplicate_available?).and_return(true)
 
       expect_click_menu_bar(at.menu_item("Duplicate"), "File")
-      expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("duplicate window", "New name duplicate window")
+      expect(subject).to receive(:do_and_wait_for_new_standard_window).and_yield.and_return("duplicate window", "New name duplicate window")
 
       allow(subject).to receive_message_chain(:clone, :control).and_return(new_instance_control)
       expect(subject).to receive(:sleep).with(0.4) # Avoiding Mountain Lion crash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osaka
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Bas Vodde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,6 +81,7 @@ files:
 - spec/integration_keynote_spec.rb
 - spec/integration_numbers_spec.rb
 - spec/integration_pages_numbers_mail_merge_spec.rb
+- spec/integration_pages_spec.rb
 - spec/integration_preview_spec.rb
 - spec/integration_textedit_spec.rb
 - spec/keynote_flows_spec.rb