osaka 0.3.1 → 0.3.2

data/lib/osaka/applicationwrapperexpectations.rb

@@ -3,85 +3,89 @@ module Osaka
   module ApplicationWrapperExpectations
     
     def expect_clone
-      @wrapper.should_receive(:clone)
+      wrapper.should_receive(:clone)
     end
     
     def expect_activate
-      @wrapper.should_receive(:activate)
+      wrapper.should_receive(:activate)
     end
     
     def expect_focus
-      @wrapper.should_receive(:focus)
+      wrapper.should_receive(:focus)
     end
     
     def expect_set_current_window(name)
-      @wrapper.should_receive(:set_current_window).with(name)
+      wrapper.should_receive(:set_current_window).with(name)
     end
     
     def expect_running?
-      @wrapper.should_receive(:running?)
+      wrapper.should_receive(:running?)
     end
     
     def expect_quit
-      @wrapper.should_receive(:quit)
+      wrapper.should_receive(:quit)
     end
     
     def expect_window_list
-      @wrapper.should_receive(:window_list)
+      wrapper.should_receive(:window_list)
     end
     
     def expect_set(element, location, value)
-      @wrapper.should_receive(:set).with(element, location, value)
+      wrapper.should_receive(:set).with(element, location, value)
     end
     
     def expect_keystroke(key, modifier = [])
-      @wrapper.should_receive(:keystroke).with(key, modifier).and_return(@wrapper) unless modifier.empty?
-      @wrapper.should_receive(:keystroke).with(key).and_return(@wrapper) if modifier.empty?
+      wrapper.should_receive(:keystroke).with(key, modifier).and_return(wrapper) unless modifier.empty?
+      wrapper.should_receive(:keystroke).with(key).and_return(wrapper) if modifier.empty?
     end
     
     def expect_keystroke!(key, modifier = [])
-      @wrapper.should_receive(:keystroke!).with(key, modifier).and_return(@wrapper) unless modifier.empty?
-      @wrapper.should_receive(:keystroke!).with(key).and_return(@wrapper) if modifier.empty?
+      wrapper.should_receive(:keystroke!).with(key, modifier).and_return(wrapper) unless modifier.empty?
+      wrapper.should_receive(:keystroke!).with(key).and_return(wrapper) if modifier.empty?
     end
     
     def expect_click!(location)
-      @wrapper.should_receive(:click!).with(location).and_return(@wrapper)
+      wrapper.should_receive(:click!).with(location).and_return(wrapper)
     end
     
     def expect_click(location)
-      @wrapper.should_receive(:click).with(location).and_return(@wrapper)
+      wrapper.should_receive(:click).with(location).and_return(wrapper)
     end
     
     def expect_click_menu_bar(menu_item, menu_name)
-      @wrapper.should_receive(:click_menu_bar).with(menu_item, menu_name).and_return(@wrapper)
+      wrapper.should_receive(:click_menu_bar).with(menu_item, menu_name).and_return(wrapper)
+    end
+    
+    def expect_get!(element, location)
+      wrapper.should_receive(:get!).with(element, location)
     end
     
     def expect_tell(do_this)
-      @wrapper.should_receive(:tell).with(do_this)
+      wrapper.should_receive(:tell).with(do_this)
     end
     
     def expect_system_event(event)
-      @wrapper.should_receive(:system_event).with(event)
+      wrapper.should_receive(:system_event).with(event)
     end
     
     def expect_exists(location)
-      @wrapper.should_receive(:exists).with(location)
+      wrapper.should_receive(:exists).with(location)
     end
     
     def expect_wait_until_exists(location)
-      @wrapper.should_receive(:wait_until_exists).with(location)
+      wrapper.should_receive(:wait_until_exists).with(location)
     end
 
     def expect_wait_until_exists!(*location)
-      @wrapper.should_receive(:wait_until_exists!).with(*location)
+      wrapper.should_receive(:wait_until_exists!).with(*location)
     end
     
     def expect_wait_until_not_exists(location)
-      @wrapper.should_receive(:wait_until_not_exists).with(location)
+      wrapper.should_receive(:wait_until_not_exists).with(location)
     end
     
     def expect_until_not_exists!(element)
-      @wrapper.should_receive(:until_not_exists!).with(element).and_yield
+      wrapper.should_receive(:until_not_exists!).with(element).and_yield
     end  
   end
 end

data/lib/osaka/mailmergeflow.rb

@@ -12,6 +12,9 @@ module CommonFlows
     pages.open(pages_file)
     pages.mail_merge_to_pdf(output_file)
     
+    numbers.close(:dont_save)
+    pages.close(:dont_save)
+
     numbers.quit(:dont_save)
     pages.quit(:dont_save)
     

data/lib/osaka/typicalapplication.rb

@@ -155,6 +155,7 @@ module Osaka
       }
       new_instance = clone
       new_instance.wrapper.set_current_window(do_and_wait_for_new_window {
+        sleep(0.4) # This sleep is added because mountain lion keynote crashes without it!
         @wrapper.keystroke!(:return)
       })
       

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/applicationwrapper_spec.rb

@@ -19,7 +19,7 @@ describe "Osaka::ApplicationWrapper" do
     subject.set_current_window "Window"
     new_wrapper = subject.clone
     new_wrapper.should == subject
-    new_wrapper.should_not.equal?(subject)
+    new_wrapper.should_not equal(subject)
   end
   
   it "Should be able to compare objects using names" do

data/spec/calculator_spec.rb

@@ -6,20 +6,17 @@ describe "Mac GUI Calculator" do
   include(*Osaka::ApplicationWrapperExpectations)
 
   subject { Osaka::Calculator.new }
+  let(:wrapper) { subject.wrapper = double("Osaka::ApplicationWrapper")}
 
-  before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper")
-  end
-  
   it "Should be setting the window when starting the Calculator" do
     
     # TODO: Fix this duplication between this and TextEdit.
     
-    @wrapper.should_receive(:activate)
-    @wrapper.should_receive(:current_window_name).and_return("")
+    wrapper.should_receive(:activate)
+    wrapper.should_receive(:current_window_name).and_return("")
     subject.should_receive(:wait_for_new_window).with([])
-    @wrapper.should_receive(:window_list).and_return(["Calculator"])
-    @wrapper.should_receive(:set_current_window).with("Calculator")
+    wrapper.should_receive(:window_list).and_return(["Calculator"])
+    wrapper.should_receive(:set_current_window).with("Calculator")
     subject.activate
   end
     
@@ -34,14 +31,14 @@ describe "Mac GUI Calculator" do
   end
   
   it "Should be able to quit the calculator" do
-    @wrapper.should_receive(:running?).and_return(true)
-    @wrapper.should_receive(:quit)
+    wrapper.should_receive(:running?).and_return(true)
+    wrapper.should_receive(:quit)
     subject.quit
   end
   
   it "Should be able to get the value from the screen" do
     expect_wait_until_exists!(at.static_text(1).group(1))
-    @wrapper.should_receive(:get!).with("value", at.static_text(1).group(1)).and_return("0")
+    wrapper.should_receive(:get!).with("value", at.static_text(1).group(1)).and_return("0")
     subject.result.should == "0"
   end
   

data/spec/keynote_flows_spec.rb

@@ -3,28 +3,26 @@ require "osaka"
 
 describe "Common flows in keynote" do
 
-  before(:each) do
-    @mock_keynote = double(:Keynote)
-  end
+  let(:mock_keynote) { double(:Keynote)}
 
   it "Should be able to combine just one single file" do
-    Osaka::Keynote.should_receive(:new).and_return(@mock_keynote)
-    @mock_keynote.should_receive(:open).with("one_file.key")
-    @mock_keynote.should_receive(:save_as).with("result.key")
-    @mock_keynote.should_receive(:save)
-    @mock_keynote.should_receive(:quit)
+    Osaka::Keynote.should_receive(:new).and_return(mock_keynote)
+    mock_keynote.should_receive(:open).with("one_file.key")
+    mock_keynote.should_receive(:save_as).with("result.key")
+    mock_keynote.should_receive(:save)
+    mock_keynote.should_receive(:quit)
     CommonFlows.keynote_combine_files("result.key", "one_file.key")
   end
   
   it "Should be able to combine multiple files in one result" do
     mock2_keynote = double(:Keynote)
     mock3_keynote = double(:Keynote)
-    Osaka::Keynote.should_receive(:new).and_return(@mock_keynote, mock2_keynote, mock3_keynote)  
-    @mock_keynote.should_receive(:open).with("one_file.key")
-    @mock_keynote.should_receive(:save_as).with("result.key")
-    @mock_keynote.should_receive(:select_all_slides).exactly(2).times
-    @mock_keynote.should_receive(:paste).exactly(2).times
-    @mock_keynote.should_receive(:save)
+    Osaka::Keynote.should_receive(:new).and_return(mock_keynote, mock2_keynote, mock3_keynote)  
+    mock_keynote.should_receive(:open).with("one_file.key")
+    mock_keynote.should_receive(:save_as).with("result.key")
+    mock_keynote.should_receive(:select_all_slides).exactly(2).times
+    mock_keynote.should_receive(:paste).exactly(2).times
+    mock_keynote.should_receive(:save)
     
 
     mock2_keynote.should_receive(:open).with("two_file.key")
@@ -37,7 +35,7 @@ describe "Common flows in keynote" do
     mock3_keynote.should_receive(:copy)
     mock3_keynote.should_receive(:close)
     
-    @mock_keynote.should_receive(:quit)
+    mock_keynote.should_receive(:quit)
     CommonFlows.keynote_combine_files("result.key", ["one_file.key", "two_file.key", "three_file.key"])    
   end
   

data/spec/keynote_spec.rb

@@ -6,13 +6,10 @@ describe "Osaka::Keynote" do
   include(*Osaka::ApplicationWrapperExpectations)
 
   subject { Osaka::Keynote.new }
-  
-  before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper").as_null_object
-  end
+  let(:wrapper) {subject.wrapper = double("Osaka::ApplicationWrapper").as_null_object}
   
   it "Should create the correct keynote print dialog" do
-    subject.create_print_dialog("window").class.should == Osaka::KeynotePrintDialog
+    subject.create_print_dialog("window").should be_instance_of Osaka::KeynotePrintDialog
   end
   
   it "Should be possible to select all the slides in the default location" do

data/spec/mailmergeflow_spec.rb

@@ -3,38 +3,39 @@ require "osaka"
 
 describe "Mail Merge to PDF common flow" do
 
-  before(:each) do
-    @mock_numbers = double(:Numbers)
-    @mock_pages = double(:Pages)
-  end
-  
+  let(:mock_numbers) { double(:Numbers)}
+  let(:mock_pages) { double(:Pages) }
+
   it "Should do a good mail merge with Pages and Keynote flow" do
-    Osaka::Numbers.should_receive(:new).and_return(@mock_numbers)
-    Osaka::Pages.should_receive(:new).and_return(@mock_pages)
+    Osaka::Numbers.should_receive(:new).and_return(mock_numbers)
+    Osaka::Pages.should_receive(:new).and_return(mock_pages)
     
-    @mock_numbers.should_receive(:open).with("/template/numbers")    
-    @mock_numbers.should_receive(:save)
+    mock_numbers.should_receive(:open).with("/template/numbers")    
+    mock_numbers.should_receive(:save)
+
+    mock_pages.should_receive(:open).with("/template/pages")
+    mock_pages.should_receive(:mail_merge_to_pdf).with("/output/file.pdf")
 
-    @mock_pages.should_receive(:open).with("/template/pages")
-    @mock_pages.should_receive(:mail_merge_to_pdf).with("/output/file.pdf")
+    mock_numbers.should_receive(:close).with(:dont_save)
+    mock_pages.should_receive(:close).with(:dont_save)
     
-    @mock_numbers.should_receive(:quit).with(:dont_save)
-    @mock_pages.should_receive(:quit).with(:dont_save)
+    mock_numbers.should_receive(:quit).with(:dont_save)
+    mock_pages.should_receive(:quit).with(:dont_save)
     
     CommonFlows.number_and_pages_mail_merge("/template/numbers", "/template/pages", "/output/file.pdf") {}
   end
   
   it "Should yield for filling in the numbers fields" do
-    @mock_numbers.as_null_object
-    @mock_pages.as_null_object
-    Osaka::Numbers.should_receive(:new).and_return(@mock_numbers)
-    Osaka::Pages.should_receive(:new).and_return(@mock_pages)
+    mock_numbers.as_null_object
+    mock_pages.as_null_object
+    Osaka::Numbers.should_receive(:new).and_return(mock_numbers)
+    Osaka::Pages.should_receive(:new).and_return(mock_pages)
 
     retrieved_numbers = nil
     CommonFlows.number_and_pages_mail_merge("1", "2", "3") { |numbers|
       retrieved_numbers = numbers
     }    
-    retrieved_numbers.should == @mock_numbers
+    retrieved_numbers.should == mock_numbers
   end
   
 end

data/spec/numbers_spec.rb

@@ -3,14 +3,14 @@ require 'osaka'
 
 describe "Osaka::Numbers" do
 
-  subject { Osaka::Numbers.new }
-  
-  before (:each) do
-    subject.wrapper = double("Osaka::Number").as_null_object
-  end
+  include(*Osaka::ApplicationWrapperExpectations)
+
+  subject { Osaka::Numbers.new }  
+  let(:wrapper) { subject.wrapper = double("Osaka::Number").as_null_object}
   
   it "Should be able to fill in data in cells" do
-    subject.wrapper.should_receive(:tell).with('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.wrapper.should_receive(:tell).with('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')
+    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
   

data/spec/pages_spec.rb

@@ -7,9 +7,7 @@ describe "Osaka::Pages" do
 
   subject { Osaka::Pages.new }
   
-  before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper").as_null_object
-  end
+  let (:wrapper) { subject.wrapper = double("Osaka::ApplicationWrapper").as_null_object}
   
   it "Should be able to do mail merge to a PDF flow" do
     
@@ -25,14 +23,14 @@ describe "Osaka::Pages" do
   end
     
   it "Should be able to select the Mail Merge" do
-    @wrapper.should_receive(:current_window_name).any_number_of_times.and_return("Pages.pages")
+    wrapper.should_receive(:current_window_name).any_number_of_times.and_return("Pages.pages")
     expect_click_menu_bar(at.menu_item(20), "Edit")
     expect_wait_until_exists(at.button("Merge").sheet(1))
     subject.mail_merge
   end
 
   it "Should click the merge button of the mail merge dialog" do
-    @wrapper.should_receive(:current_window_name).any_number_of_times.and_return("Pages.pages")
+    wrapper.should_receive(:current_window_name).any_number_of_times.and_return("Pages.pages")
     expect_click!(at.button("Merge").sheet(1))
     expect_wait_until_exists!(at.menu_button("PDF").window("Print"))
     subject.mail_merge.merge
@@ -44,11 +42,7 @@ describe "Osaka::Pages Mail Merge dialog" do
   include(*Osaka::ApplicationWrapperExpectations)
 
   subject { Osaka::PagesMailMergeDialog.new("", nil) }
-  
-  before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper").as_null_object
-    @location = subject.location = "window \"Pages.pages\""
-  end
+  let(:wrapper) {subject.wrapper = double("Osaka::ApplicationWrapper").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))

data/spec/textedit_spec.rb

@@ -7,17 +7,15 @@ describe "TextEdit" do
 
   subject { Osaka::TextEdit.new }
 
-  before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper")
-  end
-    
+  let(:wrapper) { subject.wrapper = double("Osaka::ApplicationWrapper") }
+
   it "Should be able to type some text" do
     expect_keystroke('Hello World')
     subject.type("Hello World")
   end
   
   it "Should be able to get the text from the document" do
-    subject.wrapper.should_receive(:get!).with("value", 'text area 1 of scroll area 1').and_return("Hello")
+    expect_get!("value", 'text area 1 of scroll area 1').and_return("Hello")
     subject.text.should == "Hello"
   end
 

data/spec/typicalapplication_spec.rb

@@ -7,8 +7,9 @@ describe "Osaka::TypicalApplication" do
   
   subject { Osaka::TypicalApplication.new("ApplicationName") }
   
+  let(:wrapper) { subject.wrapper = double("Osaka::ApplicationWrapper") }
+  
   before (:each) do
-    @wrapper = subject.wrapper = double("Osaka::ApplicationWrapper")
     Osaka::ScriptRunner.enable_debug_prints
   end
   
@@ -99,7 +100,7 @@ describe "Osaka::TypicalApplication" do
     subject.should_receive(:duplicate_available?).and_return(true)
     subject.should_receive(:duplicate).and_return(new_instance)
     new_instance.should_receive(:wrapper).and_return(new_instance_wrapper)
-    new_instance_wrapper.should_receive(:clone).and_return(@wrapper)
+    new_instance_wrapper.should_receive(:clone).and_return(wrapper)
     
     subject.should_receive(:close)
     subject.should_receive(:save_dialog).and_return(save_dialog)
@@ -123,7 +124,8 @@ describe "Osaka::TypicalApplication" do
     subject.should_receive(:do_and_wait_for_new_window).and_yield.and_return("duplicate window", "New name duplicate window")
     expect_keystroke("s", [:command, :shift])  
     subject.should_receive(:clone).and_return(new_instance)
-    new_instance.should_receive(:wrapper).and_return(@wrapper)
+    new_instance.should_receive(:wrapper).and_return(wrapper)
+    subject.should_receive(:sleep).with(0.4) # Avoiding Mountain Lion crash
     expect_keystroke!(:return)
     expect_set_current_window("New name duplicate window")
     subject.duplicate.should == new_instance
@@ -253,7 +255,7 @@ describe "Osaka::TypicalApplication" do
     end
     
     it "Should set the path when a full path is given" do
-      @wrapper.as_null_object
+      wrapper.as_null_object
       subject.should_receive(:set_filename)
       subject.should_receive(:set_folder).with("/path/second")
       subject.save("/path/second/name")
@@ -266,7 +268,7 @@ describe "Osaka::TypicalApplication" do
     end
     
     it "Should be able to set the filename" do
-      @wrapper.should_receive(:set).with('value', at.text_field(1).sheet(1), "filename")
+      wrapper.should_receive(:set).with('value', at.text_field(1).sheet(1), "filename")
       subject.set_filename("filename")
     end
     

metadata

@@ -2,7 +2,7 @@
 name: osaka
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Bas Vodde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-07 00:00:00 +08:00
+date: 2012-08-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency