osaka 0.2.3 → 0.3.0

data/spec/textedit_spec.rb

@@ -13,16 +13,16 @@ describe "TextEdit" do
   
   it "should set the window on activation" do
     @wrapper.should_receive(:activate)
-    @wrapper.should_receive(:window).and_return(nil)
+    @wrapper.should_receive(:current_window_name).and_return("")
     subject.should_receive(:wait_for_new_window).with([])
     @wrapper.should_receive(:window_list).and_return(["Untitled"])
-    @wrapper.should_receive(:window=).with("Untitled")
+    @wrapper.should_receive(:set_current_window).with("Untitled")
     subject.activate
   end
   
   it "shouldn't set the window on activation when it is already set" do
     @wrapper.should_receive(:activate)
-    @wrapper.should_receive(:window).and_return("Untitled")
+    @wrapper.should_receive(:current_window_name).and_return("Untitled")
     subject.activate    
   end
   

data/spec/typicalapplication_spec.rb

@@ -9,27 +9,48 @@ describe "Osaka::TypicalApplication" do
   
   before (:each) do
     @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper")
+    Osaka::ScriptRunner.enable_debug_prints
   end
   
-  it "Should pass the right open string to the Keynote application osascript" do
+  after (:each) do
+    Osaka::ScriptRunner.disable_debug_prints
+  end
+  
+  it "Should pass the right open string to the application osascript" do
     filename = "filename.key"
     expect_tell("open \"#{File.absolute_path(filename)}\"")
-    @wrapper.should_receive(:window=).with(filename)
+    @wrapper.should_receive(:set_current_window).with(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_tell("open \"#{File.absolute_path(filename)}\"")
+    @wrapper.should_receive(:set_current_window).with("filename.key")
+    subject.open(filename)        
+  end
+  
   it "Should be able to quit" do
+    @wrapper.should_receive(:running?).and_return(true)
     @wrapper.should_receive(:quit)
     subject.quit
   end
   
+  it "Should be able to check if its running" do
+    @wrapper.should_receive(:running?)
+    subject.running?
+  end
+  
+  it "Won't quit when the application isn't running" do
+    @wrapper.should_receive(:running?).and_return(false)
+    subject.quit(:dont_save)  
+  end
+  
   it "Should be able to quit without saving" do
-    @wrapper.should_receive(:window).any_number_of_times.and_return("Untitled")
+    @wrapper.should_receive(:running?).and_return(true, true, false)
     @wrapper.should_receive(:quit)
-    should_do_until!(:not_exists, "window \"Untitled\"") {
-      should_check!(:exists, "sheet 1 of window \"Untitled\"", true)
-      expect_click!('button 2 of sheet 1 of window "Untitled"')
-    }
+    should_check!(:exists, at.sheet(1), true)
+    expect_click!(at.button(2).sheet(1))
     subject.quit(:dont_save)  
   end
   
@@ -52,7 +73,7 @@ describe "Osaka::TypicalApplication" do
     subject.wrapper.should_receive(:window_list)
     expect_keystroke("n", :command)
     subject.should_receive(:wait_for_new_window).and_return("new_window")
-    subject.wrapper.should_receive(:window=).with("new_window")
+    subject.wrapper.should_receive(:set_current_window).with("new_window")
     subject.wrapper.should_receive(:focus)
     subject.new_document
   end
@@ -62,6 +83,14 @@ describe "Osaka::TypicalApplication" do
     subject.save
   end
   
+  it "Should be able to save as a file" do
+    save_dialog = double("Osaka::TypicalSaveDialog")
+    subject.should_receive(:save_dialog).and_return(save_dialog)
+    save_dialog.should_receive(:save).with("filename")
+    subject.wrapper.should_receive(:set_current_window).with("filename")
+    subject.save_as("filename")
+  end
+  
   it "Should be able to close" do
     expect_keystroke("w", :command)
     subject.close
@@ -72,19 +101,49 @@ describe "Osaka::TypicalApplication" do
     subject.should_receive(:wait_for_window_and_dialogs_to_close).with(:dont_save)
     subject.close(:dont_save)
   end
-    
-  it "Should be able to activate keynote" do
+  
+  it "Should be able to activate" do
     @wrapper.should_receive(:activate)
     subject.activate
   end
   
+  it "Should be able to focus" do
+    @wrapper.should_receive(:focus)
+    subject.focus
+  end
+  
+  it "Should be able to copy" do
+    expect_keystroke("c", :command)
+    subject.copy
+  end
+  
+  it "Should be able to paste" do
+    expect_keystroke("v", :command)
+    subject.paste  
+  end
+
+  it "Should be able to cut" do
+    expect_keystroke("x", :command)
+    subject.cut
+  end
+  
+  it "Should be able to select all" do
+    expect_keystroke("a", :command)
+    subject.select_all
+  end
+  
   it "Should be able to retrieve a print dialog" do
     expect_keystroke("p", :command)
-    @wrapper.should_receive(:construct_window_info).and_return(" of window 1")
-    should_wait_until(:exists, "sheet 1 of window 1")
+    should_wait_until(:exists, at.sheet(1))
     subject.print_dialog
   end
   
+  it "Should be able to retrieve a save dialog" do
+    expect_keystroke("s", [:command, :shift])
+    should_wait_until(:exists, at.sheet(1))
+    subject.save_dialog    
+  end
+  
   describe "Application info" do
     it "Should be able to retrieve an application info object and parse it" do
       @wrapper.should_receive(:tell).with('get info for (path to application "ApplicationName")').and_return('name:ApplicationName.app, creation date:date "Sunday, December 21, 2008 PM 06:14:11"}')
@@ -95,23 +154,22 @@ describe "Osaka::TypicalApplication" do
   
   describe "Generic Print Dialog" do
     
-    location = "window 1"
-    subject { Osaka::TypicalPrintDialog.new("window 1", double(:OSAApp).as_null_object) }
+    subject { Osaka::TypicalPrintDialog.new(at.sheet(1), double(:OSAApp).as_null_object) }
 
     it "Should be able to save the PDF in a print dialog" do
       save_dialog_mock = double(:GenericSaveDialog)
       
-      expect_click!('menu button "PDF" of window 1') 
-      should_wait_until!(:exists, 'menu 1 of menu button "PDF" of window 1')
+      expect_click!(at.menu_button("PDF").sheet(1)) 
+      should_wait_until!(:exists, at.menu(1).menu_button("PDF").sheet(1))
       
-      expect_click!('menu item 2 of menu 1 of menu button "PDF" of window 1')
-      should_wait_until!(:exists, 'window "Save"')
+      expect_click!(at.menu_item(2).menu(1).menu_button("PDF").sheet(1))
+      should_wait_until!(:exists, at.window("Save"))
 
-      subject.should_receive(:create_save_dialog).with("window \"Save\"", subject.wrapper).and_return(save_dialog_mock)
+      subject.should_receive(:create_save_dialog).with(at.window("Save"), subject.wrapper).and_return(save_dialog_mock)
       save_dialog_mock.should_receive(:save).with("filename")
       
-      should_do_until!(:not_exists, 'window 1') {
-        expect_click!('checkbox 1 of window "Print"')
+      should_do_until!(:not_exists, at.sheet(1)) {
+        expect_click!(at.checkbox(1).window("Print"))
       }
       
       subject.save_as_pdf("filename")
@@ -120,7 +178,14 @@ describe "Osaka::TypicalApplication" do
   
   describe "Generic Save Dialog" do
     
-    subject { Osaka::TypicalSaveDialog.new("window 1", double("Osaka::ApplicationWrapper").as_null_object)}
+    subject { Osaka::TypicalSaveDialog.new(at.sheet(1), double("Osaka::ApplicationWrapper").as_null_object)}
+    
+    it "Should clone the wrapper and change the window name to Save" do
+      app_wrapper = double("Osaka::ApplicationWrapper")
+      app_cloned_wrapper = double("Osaka::ApplicationWrapper")
+      app_wrapper.should_receive(:clone).and_return(app_cloned_wrapper)
+      Osaka::TypicalSaveDialog.new(at.sheet(1), app_wrapper)
+    end
     
     it "Should set the filename in the test field" do
       subject.should_receive(:set_filename).with("filename")
@@ -144,22 +209,22 @@ describe "Osaka::TypicalApplication" do
     end
     
     it "Should be able to click save" do
-      expect_click('button "Save" of window 1')
-      should_wait_until(:not_exists, 'window 1')
+      expect_click(at.button("Save").sheet(1))
+      should_wait_until(:not_exists, at.sheet(1))
       subject.click_save
     end
     
     it "Should be able to set the filename" do
-      subject.wrapper.should_receive(:set).with('value', 'text field 1 of window 1', "filename")
+      subject.wrapper.should_receive(:set).with('value', at.text_field(1).sheet(1), "filename")
       subject.set_filename("filename")
     end
     
     it "Should be able to set the path" do
       expect_keystroke("g", [ :command, :shift ])
-      should_wait_until(:exists,  "sheet 1 of window 1")
-      subject.wrapper.should_receive(:set).with("value", "text field 1 of sheet 1 of window 1", "path")
-      expect_click('button "Go" of sheet 1 of window 1')
-      should_wait_until(:not_exists, "sheet 1 of window 1")
+      should_wait_until(:exists,  at.sheet(1).sheet(1))
+      subject.wrapper.should_receive(:set).with("value", at.text_field(1).sheet(1).sheet(1), "path")
+      expect_click(at.button("Go").sheet(1).sheet(1))
+      should_wait_until(:not_exists, at.sheet(1).sheet(1))
       subject.set_folder("path")
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: osaka
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bas Vodde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-14 00:00:00 +08:00
+date: 2012-07-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,9 @@ files:
 - lib/osaka/applicationwrapperexpectations.rb
 - lib/osaka/calculator.rb
 - lib/osaka/keynote.rb
+- lib/osaka/keynoteflow.rb
+- lib/osaka/location.rb
+- lib/osaka/mailmergeflow.rb
 - lib/osaka/numbers.rb
 - lib/osaka/pages.rb
 - lib/osaka/scriptrunner.rb
@@ -59,10 +62,20 @@ files:
 - lib/osaka/version.rb
 - osaka.gemfile
 - spec/applicationwrapper_spec.rb
+- spec/assets/01_first_slides.key
+- spec/assets/02_second_slides.key
+- spec/assets/03_third_slides.key
+- spec/assets/mail_merge_data.numbers
+- spec/assets/mail_merge_template.pages
 - spec/calculator_spec.rb
 - spec/integration_calculator_spec.rb
+- spec/integration_keynote_spec.rb
+- spec/integration_pages_numbers_mail_merge_spec.rb
 - spec/integration_textedit_spec.rb
+- spec/keynote_flows_spec.rb
 - spec/keynote_spec.rb
+- spec/location_spec.rb
+- spec/mailmergeflow_spec.rb
 - spec/numbers_spec.rb
 - spec/pages_spec.rb
 - spec/scriptrunner_spec.rb