osaka 0.4.8 → 0.4.10

data/lib/osaka/typicalprintdialog.rb

@@ -29,4 +29,4 @@ module Osaka
     end
   end
   
-end
+end

data/lib/osaka/typicalsavedialog.rb

@@ -19,4 +19,4 @@ module Osaka
 
   end  
 
-end
+end

data/lib/osaka/version.rb

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

data/spec/calculator_spec.rb

@@ -6,13 +6,13 @@ describe "Mac GUI Calculator" do
   include(*Osaka::OsakaExpectations)
 
   subject { Osaka::Calculator.new }
-  let(:control) { subject.control = mock("RemoteControl", :mac_version => :mountain_lion)}
-
+  let(:control) { subject.control = double("RemoteControl", :mac_version => :mountain_lion)}
+    
   it "Should be setting the window when starting the Calculator" do
         
     expect_activate
     expect_current_window_name.and_return("")
-    subject.should_receive(:wait_for_new_window).with([])
+    expect(subject).to receive(:wait_for_new_window).with([])
     expect_window_list.and_return(["Calculator"])
     expect_set_current_window("Calculator")
     subject.activate
@@ -37,7 +37,7 @@ describe "Mac GUI Calculator" do
   it "Should be able to get the value from the screen" do
     expect_wait_until_exists!(at.static_text(1).group(1))
     expect_get!("value", at.static_text(1).group(1)).and_return("0")
-    subject.result.should == "0"
+    expect(subject.result).to eq "0"
   end
   
-end
+end

data/spec/defaultssystem_spec.rb

@@ -0,0 +1,30 @@
+
+require 'osaka'
+
+describe "Wrapper around the defaults app which can be used for storing and retrieving preferences" do
+  
+  before (:each) do
+    @worldclock_widget = <<-END_OF_DUMP  
+{
+    "0000000000000002-city" = 44;
+    "0000000000000002-continent" = 1;
+    city = 44;
+    continent = 1;
+}
+END_OF_DUMP
+  end
+  
+  it "Can retrieve the settings from a domain (A domain is usually an application)" do
+    expect(Osaka::CommandRunner).to receive(:run).with("defaults read widget-com.apple.widget.worldclock").and_return(@worldclock_widget)
+    settings = DefaultsSystem.new("widget-com.apple.widget.worldclock")
+    expect(settings["city"]).to eq "44"
+  end
+  
+  it "Can set settings on a domain" do
+    expect(Osaka::CommandRunner).to receive(:run).with("defaults read com.osaka").and_return(@worldclock_widget)
+    expect(Osaka::CommandRunner).to receive(:run).with("defaults write com.osaka key value").and_return(@worldclock_widget)    
+    settings = DefaultsSystem.new("com.osaka")
+    settings["key"] = "value"
+  end
+  
+end

data/spec/integration_calculator_spec.rb

@@ -1,7 +1,7 @@
 
 require 'osaka'
 
-describe "Integration test using the Calculator" do
+describe "Integration test using the Calculator", :integration => true do
 
   subject { Osaka::Calculator.new }
 
@@ -22,20 +22,20 @@ describe "Integration test using the Calculator" do
     subject.click("+")
     subject.click("1")
     subject.click("=")
-    subject.result.should == "2"
+    expect(subject.result).to eq "2"
   end
   
   it "Should be able to do calculations using keyboard" do
     subject.key("10")
     subject.key("*")
     subject.key("10")
-    subject.key("=")
-    subject.result.should == "100"    
+    subject.key("+")
+    expect(subject.result).to eq "100"    
   end
   
   it "Should do whole formulas using key" do
-    subject.key("100+10*3+99=")
-    subject.result.should == "229"        
+    subject.key("100+10*3+99+")
+    expect(subject.result).to eq "229"        
   end
   
-end
+end

data/spec/integration_keynote_spec.rb

@@ -1,29 +1,42 @@
 require 'tmpdir'
 require 'osaka'
 
-describe "Integration tests for Keynote and Common Flows" do
-  
-  it "Should be able to do a combine with just one file" do
+describe "Integration tests for Keynote and Common Flows", :integration => true do
+
+  before(:each) do
+    @assets_directory =  File.join(File.dirname(__FILE__), "assets")
+  end
     
-    assets_directory =  File.join(File.dirname(__FILE__), "assets")
+  it "Should be able to do a combine with just one file" do
     
-    keynote_file = File.join(assets_directory, "01_first_slides.key")
+    keynote_file = File.join(@assets_directory, "01_first_slides.key")
     Dir.mktmpdir { |dir|
       results_file = File.join(dir, "results.key")
       CommonFlows.keynote_combine_files(results_file, keynote_file)
-      File.exists?(results_file).should == true
+      expect(File.exists?(results_file)).to eq true
     }
   end
   
   it "Should be able to combine multiple files" do
-    assets_directory =  File.join(File.dirname(__FILE__), "assets")
     
     Dir.mktmpdir { |dir|
       results_file = File.join(dir, "results.key")
-      CommonFlows.keynote_combine_files_from_directory_sorted(results_file, assets_directory)
-      File.exists?(results_file).should == true
-    }
+      CommonFlows.keynote_combine_files_from_directory_sorted(results_file, @assets_directory)
+      expect(File.exists?(results_file)).to eq true
+    }  
+  end
+  
+  it "Should exit with message if files are open" do
     
+    keynote_file = File.join(@assets_directory, "01_first_slides.key")
+    keynote = Osaka::Keynote.new
+    keynote.open(keynote_file)
+
+    expect {
+      CommonFlows.keynote_combine_files(nil, keynote_file)
+    }.to raise_error(Osaka::ApplicationWindowsMustBeClosed, "All Keynote windows must be closed before running this flow")
+
+    keynote.close
   end
   
-end
+end

data/spec/integration_numbers_spec.rb

@@ -3,7 +3,7 @@ require 'osaka'
 
 describe "Integration tests for Numbers" do
   
-  it "Should be able to fill in large index cells" do
+  it "Should be able to fill in large index cells", :integration => true do
     
     Dir.mktmpdir { |dir|
       
@@ -14,4 +14,4 @@ describe "Integration tests for Numbers" do
     
   end
   
-end
+end

data/spec/integration_pages_numbers_mail_merge_spec.rb

@@ -1,7 +1,7 @@
 require 'tmpdir'
 require 'osaka'
 
-describe "Integration of mail merge flow with Pages and Numbers" do
+describe "Integration of mail merge flow with Pages and Numbers", :integration => true do
 
 
   before (:each) do
@@ -10,11 +10,11 @@ describe "Integration of mail merge flow with Pages and Numbers" do
     @pages_template_filename = File.join(@tempdir, "mail_merge_template.pages")
     @pdf_output_file = File.join(@tempdir, "output.pdf")
   end
-  
+
   after (:each) do
     FileUtils.remove_entry_secure @tempdir
   end
-  
+
   it "Should mail merge the assets and generate a PDF" do
 
     Osaka::Numbers.create_document(@numbers_filename) { |doc|
@@ -23,19 +23,19 @@ describe "Integration of mail merge flow with Pages and Numbers" do
       doc.fill_cell(2, 3, "of Data")
       doc.fill_cell(2, 4, "in Numbers")
     }
-    
+
     Osaka::Pages.create_document(@pages_template_filename) { |doc|
       doc.set_mail_merge_document(@numbers_filename)
-      doc.type("Hello World! This is pages. We're going to mail merge!\r\r")    
+      doc.type("Hello World! This is pages. We're going to mail merge!\r\r")
       doc.mail_merge_field("Data");
     }
-        
+
     CommonFlows::number_and_pages_mail_merge(@numbers_filename, @pages_template_filename, @pdf_output_file)
-    File.exists?(@pdf_output_file).should == true
-    
+    expect(File.exists?(@pdf_output_file)).to eq true
+
     preview = Osaka::Preview.new
     preview.open(@pdf_output_file)
-    preview.pdf_content.should include("Hello World")
+    expect(preview.pdf_content).to include("Hello World")
     preview.close
     preview.quit
   end

data/spec/integration_preview_spec.rb

@@ -0,0 +1,16 @@
+require 'osaka'
+
+describe "Integration tests for Preview", :integration => true do
+
+  before(:each) do
+    @assets_directory =  File.join(File.dirname(__FILE__), "assets")
+  end
+
+  it "Should be able to open a file and check if there is a certain text" do
+    preview = Osaka::Preview.new
+    preview.open(File.join(@assets_directory, "document.pdf"))
+    expect(preview.pdf_content).to include("Jamaica")
+    preview.close
+    preview.quit
+  end
+end

data/spec/integration_textedit_spec.rb

@@ -1,7 +1,7 @@
 
 require 'osaka'
 
-describe "Integration test using TextEdit" do
+describe "Integration test using TextEdit", :integration => true do
 
   subject { Osaka::TextEdit.new }
 
@@ -18,7 +18,7 @@ describe "Integration test using TextEdit" do
   it "can type in the window" do
     subject.new_document
     subject.type("Hello World")
-    subject.text.should == "Hello World"
+    expect(subject.text).to eq "Hello World"
     subject.close(:dont_save)
   end
   
@@ -32,11 +32,11 @@ describe "Integration test using TextEdit" do
     editor1.type("Typing in window 1")
     editor2.type("Typing in window 2")
         
-    editor1.text.should == "Typing in window 1"
-    editor2.text.should == "Typing in window 2"
+    expect(editor1.text).to eq "Typing in window 1"
+    expect(editor2.text).to eq "Typing in window 2"
     
     editor1.close(:dont_save)
     editor2.close(:dont_save)
   end
 
-end
+end

data/spec/keynote_flows_spec.rb

@@ -2,59 +2,80 @@
 require "osaka"
 
 describe "Common flows in keynote" do
+  
+  def should_shutdown
+    expect(mock_keynote).to receive(:save)
+    expect(mock_keynote).to receive(:close)
+    expect(mock_keynote).to receive(:quit)
+  end
 
-  let(:mock_keynote) { mock("First keynote")}
+  let(:mock_keynote) { double("First keynote")}
 
+  it "Should exit if keynote windows are already open" do
+    expect(Osaka::Keynote).to receive(:new).and_return(mock_keynote)
+    expect(mock_keynote).to receive(:activate)
+    expect(mock_keynote).to receive(:raise_error_on_open_standard_windows)
+      .with("All Keynote windows must be closed before running this flow")
+      .and_raise(Osaka::ApplicationWindowsMustBeClosed, "All Keynote windows must be closed before running this flow")
+    
+    expect {
+      CommonFlows.keynote_combine_files("result.key", "one_file.key")
+    }.to raise_error(Osaka::ApplicationWindowsMustBeClosed, "All Keynote windows must be closed before running this flow")
+  end
+  
   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)
+    expect(Osaka::Keynote).to receive(:new).and_return(mock_keynote)
+    expect(mock_keynote).to receive(:activate)
+    expect(mock_keynote).to receive(:raise_error_on_open_standard_windows)
+    expect(mock_keynote).to receive(:light_table_view)
+    expect(mock_keynote).to receive(:open).with("one_file.key")
+    expect(mock_keynote).to receive(:save_as).with("result.key")
+    should_shutdown
     CommonFlows.keynote_combine_files("result.key", "one_file.key")
   end
   
   it "Should be able to combine multiple files in one result" do
-    mock2_keynote = mock("Second keynote")
-    mock3_keynote = mock("Third 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)
+    mock2_keynote = double("Second keynote")
+    mock3_keynote = double("Third keynote")
+    expect(Osaka::Keynote).to receive(:new).and_return(mock_keynote, mock2_keynote, mock3_keynote)  
+    expect(mock_keynote).to receive(:activate)
+    expect(mock_keynote).to receive(:raise_error_on_open_standard_windows)
+    expect(mock_keynote).to receive(:open).with("one_file.key")
+    expect(mock_keynote).to receive(:light_table_view)
+    expect(mock_keynote).to receive(:save_as).with("result.key")
+    expect(mock_keynote).to receive(:select_all_slides).exactly(2).times
+    expect(mock_keynote).to receive(:paste).exactly(2).times
     
-
-    mock2_keynote.should_receive(:open).with("two_file.key")
-    mock2_keynote.should_receive(:select_all_slides)
-    mock2_keynote.should_receive(:copy)
-    mock2_keynote.should_receive(:close)
+    expect(mock2_keynote).to receive(:open).with("two_file.key")
+    expect(mock2_keynote).to receive(:select_all_slides)
+    expect(mock2_keynote).to receive(:copy)
+    expect(mock2_keynote).to receive(:close)
     
-    mock3_keynote.should_receive(:open).with("three_file.key")
-    mock3_keynote.should_receive(:select_all_slides)
-    mock3_keynote.should_receive(:copy)
-    mock3_keynote.should_receive(:close)
+    expect(mock3_keynote).to receive(:open).with("three_file.key")
+    expect(mock3_keynote).to receive(:select_all_slides)
+    expect(mock3_keynote).to receive(:copy)
+    expect(mock3_keynote).to receive(:close)
     
-    mock_keynote.should_receive(:quit)
+    should_shutdown
     CommonFlows.keynote_combine_files("result.key", ["one_file.key", "two_file.key", "three_file.key"])    
   end
   
   it "Should be able to combine multiple files from one directory sorted" do
     files_in_dir = [".", "..", "one.key", "05_file.key", "02key.wrong", "another", "01hey.key", "last"]
     files_matching = ["./05_file.key", "./01hey.key", "./one.key"]
-    Dir.should_receive(:new).with(".").and_return(files_in_dir)
-    CommonFlows.should_receive(:keynote_combine_files).with("results.key", files_matching.sort)
+    expect(Dir).to receive(:new).with(".").and_return(files_in_dir)
+    expect(CommonFlows).to receive(:keynote_combine_files).with("results.key", files_matching.sort)
     CommonFlows.keynote_combine_files_from_directory_sorted("results.key")    
   end
 
   it "Should be able to combine multiple files from one directory sorted with pattern" do
     files_in_dir = [".", "..", "05_file.key", "02key.wrong", "another", "01hey.key", "last"]
     files_in_dir_to_be_used = ["dirname/01hey.key", "dirname/05_file.key"]
-    mocked_dir = mock("Directory with keynote files")
-    Dir.should_receive(:new).with("dirname").and_return(mocked_dir)
-    mocked_dir.should_receive(:entries).and_return(files_in_dir)
-    CommonFlows.should_receive(:keynote_combine_files).with("results.key", files_in_dir_to_be_used)
+    mocked_dir = double("Directory with keynote files")
+    expect(Dir).to receive(:new).with("dirname").and_return(mocked_dir)
+    expect(mocked_dir).to receive(:entries).and_return(files_in_dir)
+    expect(CommonFlows).to receive(:keynote_combine_files).with("results.key", files_in_dir_to_be_used)
     CommonFlows.keynote_combine_files_from_directory_sorted("results.key", "dirname", /^\d+.*\.key$/)    
   end
   
-end
+end

data/spec/keynote_spec.rb

@@ -6,28 +6,38 @@ describe "Osaka::Keynote" do
   include(*Osaka::OsakaExpectations)
 
   subject { Osaka::Keynote.new }
-  let(:control) {subject.control = mock("RemoteControl").as_null_object}
+  let(:control) {subject.control = double("RemoteControl")}
   
   it "Should create the correct keynote print dialog" do
-    subject.create_print_dialog("window").should be_instance_of Osaka::KeynotePrintDialog
+    expect(subject.create_print_dialog("window")).to be_instance_of Osaka::KeynotePrintDialog
   end
   
-  it "Should be possible to select all the slides in the default location" do
-    slides_button_location = at.button("Slides").group(1).outline(1).scroll_area(2).splitter_group(1).splitter_group(1)    
-    expect_exists?(slides_button_location).and_return(true)
-    expect_click(slides_button_location)
-    subject.should_receive(:select_all)
+  it "Should be possible to select all the slides by switching to light table view" do
+    expect(subject).to receive(:light_table_view)
+    expect(subject).to receive(:select_all)
     subject.select_all_slides
   end
-
-  it "Should be possible to select all the slides in the alternative location" do
-    slides_button_location = at.button("Slides").group(1).outline(1).scroll_area(2).splitter_group(1).splitter_group(1)    
-    alternative_slides_button_location = at.button("Slides").group(1).outline(1).scroll_area(1).splitter_group(1).splitter_group(1)
-    expect_exists?(slides_button_location).and_return(false)
-    expect_click(alternative_slides_button_location)
-    subject.should_receive(:select_all)
+  
+  it "Should click light table view when the dialog is there" do
+    expect(subject.control).to receive(:exists?).and_return(true)
+    expect(subject.control).to receive(:click)
+    expect(subject).to receive(:select_all)
     subject.select_all_slides
   end
   
+  it "Should not click the dialog when it is not there" do
+    expect(subject.control).to receive(:exists?).and_return(false)
+    expect(subject.control).to receive(:click).exactly(0).times
+    expect(subject).to receive(:select_all)
+    subject.select_all_slides
+  end
+ 
+  it "Should ask for and click the light table view menu" do
+    light_table_view_selection = at.menu_item("Light Table").menu(1).menu_bar_item("View").menu_bar(1) 
+    expect_exists?(light_table_view_selection).and_return(true)
+    expect_click(light_table_view_selection)
+    expect(subject).to receive(:select_all)
+    subject.select_all_slides
+  end
   
 end